diff --git a/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java b/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
index 6413330eb57..972a6cb9d83 100644
--- a/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
+++ b/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java
@@ -24,7 +24,7 @@ public class OvsCreateTunnelAnswer extends Answer {
     //for debug info
     String fromIp;
     String toIp;
-    String key;
+    int key;
     String bridge;
     
     public OvsCreateTunnelAnswer(Command cmd, boolean success, String details, String bridge) {
@@ -70,7 +70,7 @@ public class OvsCreateTunnelAnswer extends Answer {
         return toIp;
     }
     
-    public String getKey() {
+    public int getKey() {
         return key;
     }
     
@@ -79,4 +79,3 @@ public class OvsCreateTunnelAnswer extends Answer {
     }
 }
 
->>>>>>> 9f321ff... Open vSwitch tunnel manager
diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index f9fe46fc424..09bdddb005a 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -656,6 +656,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
     private synchronized Network configureTunnelNetwork(Connection conn, long networkId, long hostId, int key) {
     	try {
 	    	Network nw = findOrCreateTunnelNetwork(conn, networkId);
+		String nwName = "OVSTunnel" + key;
 	    	//Invoke plugin to setup the bridge which will be used by this network
 	        String bridge = nw.getBridge(conn);
 	        Map<String,String> nwOtherConfig = nw.getOtherConfig(conn);