diff --git a/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java b/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java
index a1ca35e..0d56ad3 100644
--- a/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java
+++ b/src/main/java/net/onrc/onos/core/flowmanager/FlowManagerModule.java
@@ -15,6 +15,15 @@
  * TODO: Make all methods thread-safe
  */
 public class FlowManagerModule implements IFlowManagerService {
+    private ConflictDetectionPolicy conflictDetectionPolicy;
+
+    /**
+     * Constructor.
+     */
+    public FlowManagerModule() {
+        this.conflictDetectionPolicy = ConflictDetectionPolicy.FREE;
+    }
+
     @Override
     public boolean addFlow(IFlow flow) {
         BatchOperation<IFlow> ops = new BatchOperation<IFlow>();
@@ -56,14 +65,17 @@
 
     @Override
     public void setConflictDetectionPolicy(ConflictDetectionPolicy policy) {
-        // TODO Auto-generated method stub
-
+        if (policy == ConflictDetectionPolicy.FREE) {
+            conflictDetectionPolicy = policy;
+        } else {
+            throw new UnsupportedOperationException(
+                    policy.toString() + " is not supported.");
+        }
     }
 
     @Override
     public ConflictDetectionPolicy getConflictDetectionPolicy() {
-        // TODO Auto-generated method stub
-        return null;
+        return conflictDetectionPolicy;
     }
 
     @Override