diff --git a/tests/Application/.gitignore b/tests/Application/.gitignore
index 6e54f9d..169564f 100644
--- a/tests/Application/.gitignore
+++ b/tests/Application/.gitignore
@@ -3,11 +3,7 @@
 /var/*
 !/var/.gitkeep
 
-<<<<<<< HEAD
-/web/
-=======
 /web/*
->>>>>>> 1.0
 !/web/app.php
 !/web/app_dev.php
 !/web/app_test.php