diff --git a/src/main/.gitignore b/src/main/.gitignore
index 6bb99d3..85393fc 100644
--- a/src/main/.gitignore
+++ b/src/main/.gitignore
@@ -1,5 +1 @@
-<<<<<<< HEAD
 webapp/
-=======
-webapp
->>>>>>> refs/remotes/origin/feature/16359