diff --git a/.gitignore b/.gitignore
index c19474c..8ab9313 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,10 @@
 CMakeFiles
-<<<<<<< HEAD
 *.sh
-2P11
-=======
 *.a
 *.o
->>>>>>> develop
 cmake_install.cmake
 Makefile
 CMakeCache.txt
 *.app
 2P11
-clear.sh
 *.vim