diff --git a/.gitignore b/.gitignore
index 35f3010..15e8222 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 .classpath
 .project
 .settings
-/target
\ No newline at end of file
+<<<<<<< HEAD
+/target
+=======
+/target
+>>>>>>> branch 'dev' of ssh://margaretha@korap.ids-mannheim.de:29418/KorAP/KorapSRU