diff --git a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
index b989baf0b8322646f51f5d99f437ead3a4b72771..6c3f3644f9cbc0e5650ee70e294128f828201c97 100755
--- a/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
+++ b/src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java
@@ -43,6 +43,7 @@ import net.floodlightcontroller.core.IInfoProvider;
 import net.floodlightcontroller.core.IOFMessageListener;
 import net.floodlightcontroller.core.IOFSwitch;
 import net.floodlightcontroller.core.IFloodlightProviderService.Role;
+import net.floodlightcontroller.core.IListener.Command;
 import net.floodlightcontroller.core.module.FloodlightModuleContext;
 import net.floodlightcontroller.core.module.IFloodlightModule;
 import net.floodlightcontroller.core.module.IFloodlightService;
@@ -673,6 +674,14 @@ public class DeviceManagerImpl implements
                           Map<String, String> removedControllerNodeIPs) {
         // no-op
     }
+    
+    // **********************
+    // IFlowReconcileListener
+    // **********************
+ 
+    public Command reconcileFlows(ArrayList<OFMatchReconcile> ofmRcList, FloodlightContext cntx) {
+        return Command.CONTINUE;
+    }
 
     // ****************
     // Internal methods
diff --git a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java
index c9bb8d985b884395316ba7a44dcadf4b80c02618..0bf4f8788a4459df64be2e2d637c9a3f5e8f1768 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/IFlowReconcileListener.java
@@ -2,6 +2,7 @@ package net.floodlightcontroller.flowcache;
 
 import java.util.ArrayList;
 
+import net.floodlightcontroller.core.FloodlightContext;
 import net.floodlightcontroller.core.IListener;
 import org.openflow.protocol.OFType;
 
@@ -36,6 +37,10 @@ public interface IFlowReconcileListener extends IListener<OFType> {
      *           further. In this case the no reconciled flow-mods would 
      *           be programmed
      */
+<<<<<<< HEAD
     public Command reconcileFlows(ArrayList<OFMatchReconcile> ofmRcList);
+=======
+    public Command reconcileFlows(ArrayList<OFMatchReconcile> ofmRcList, FloodlightContext cntx);
+>>>>>>> 764be04... remove switchDpid from OFMatch
 
 }
diff --git a/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java b/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java
index d19aede2991f1b5a057b6997806690cb1d693c71..4fee48e1d4e526ea283f64283858c2f79dd3a1fc 100644
--- a/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java
+++ b/src/main/java/net/floodlightcontroller/flowcache/OFMatchReconcile.java
@@ -1,7 +1,6 @@
 package net.floodlightcontroller.flowcache;
 
 import net.floodlightcontroller.core.FloodlightContext;
-
 import org.openflow.protocol.OFMatchWithSwDpid;
 
 /**