diff --git a/.gitignore b/.gitignore
index 9e1eaff..2249935 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *CMakeFiles/*
 *CMakeCache*
 cmake_install.cmake
-test.sh
 *~
 gitwork
 work
@@ -18,9 +17,8 @@ compile
 todo
 vsc*
 libcompound.so
-ccwarn
-<<<<<<< HEAD
-=======
 CMakeLists_default.txt
->>>>>>> 010300157e252e47218c74f256bca0ea12b7baa3
+CompoundTest
+ccwarn
 genwarn.sh
+test.sh