diff --git a/pom.xml b/pom.xml
index 35d2428..3b78722 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.pousse-cafe-framework</groupId>
         <artifactId>pousse-cafe</artifactId>
-        <version>0.29.0</version>
+        <version>0.29.1-SNAPSHOT</version>
     </parent>
 
     <scm>
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>org.pousse-cafe-framework</groupId>
             <artifactId>pousse-cafe-core</artifactId>
-            <version>0.29.0</version>
+            <version>0.29.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.pousse-cafe-framework</groupId>
@@ -34,12 +34,6 @@
             <artifactId>pousse-cafe-spring-mongo</artifactId>
             <version>0.18.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
-            <scope>provided</scope>
-        </dependency>
 
         <dependency>
             <groupId>junit</groupId>
diff --git a/src/main/java/poussecafe/source/Conflict.java b/src/main/java/poussecafe/source/Conflict.java
index 6a82ca5..679e086 100644
--- a/src/main/java/poussecafe/source/Conflict.java
+++ b/src/main/java/poussecafe/source/Conflict.java
@@ -1,16 +1,45 @@
 package poussecafe.source;
 
-import lombok.Builder;
-import lombok.Value;
-import lombok.experimental.Accessors;
+import java.util.Objects;
+
 import poussecafe.source.analysis.ClassName;
 
-@Builder
-@Value
-@Accessors(fluent = true)
 public class Conflict {
 
+    public ClassName outerModuleClass() {
+        return outerModuleClass;
+    }
+
     private ClassName outerModuleClass;
-    
+
+    public ClassName innerModuleClass() {
+        return innerModuleClass;
+    }
+
     private ClassName innerModuleClass;
+
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    public static class Builder {
+
+        private Conflict conflict = new Conflict();
+
+        public Conflict build() {
+            Objects.requireNonNull(conflict.outerModuleClass);
+            Objects.requireNonNull(conflict.innerModuleClass);
+            return conflict;
+        }
+
+        public Builder outerModuleClass(ClassName outerModuleClass) {
+            conflict.outerModuleClass = outerModuleClass;
+            return this;
+        }
+
+        public Builder innerModuleClass(ClassName innerModuleClass) {
+            conflict.innerModuleClass = innerModuleClass;
+            return this;
+        }
+    }
 }