diff --git a/.gitignore b/.gitignore
index b80b3b0c..d818aeaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,32 +34,10 @@ docs
 .php-cs-fixer.cache
 /vendor
 *.log
-<<<<<<< HEAD
 *.lock
 *.cache
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-=======
->>>>>>> d6f5515 (Remove unnecessary files and directories)
-=======
->>>>>>> ff79a66 (Remove unnecessary files and directories)
 .git-blame-ignore-revs
 package-lock.json
 .php-cs-fixer.cache
 package-lock.json
-<<<<<<< HEAD
->>>>>>> e7768bf (.git-rewrite/ >> .gitignore)
-=======
-=======
->>>>>>> af08cfb (Remove unnecessary files and directories)
-<<<<<<< HEAD
->>>>>>> d6f5515 (Remove unnecessary files and directories)
-=======
-=======
->>>>>>> master
->>>>>>> ff79a66 (Remove unnecessary files and directories)
-=======
->>>>>>> edba113 (conflict .gitignore)
 .git-rewrite/