diff --git a/.gitignore b/.gitignore
index 3831df8221975194ecb00fd7c17d8ffceec6ea2b..73ce2639d9a63c4845ed5e8cf048689803ee94a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,4 @@
 vas/
 client/
-<<<<<<< HEAD
 conf/
 src/closure/
-=======
-conf/closure
-conf/node_modules/
-conf/properties.json
-src/closure/conf/depswriter/
->>>>>>> 05269f92990d0e0fd0c2fc1d62f823e6a17bd473