diff --git a/.gitignore b/.gitignore
index 15e8222..9f0382d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 .classpath
 .project
 .settings
-<<<<<<< HEAD
-/target
-=======
-/target
->>>>>>> branch 'dev' of ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/KorapSRU
+target
+