diff --git a/.gitignore b/.gitignore
index ad0e957..52987dd 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,5 @@
-<<<<<<< HEAD
 CMakeFiles
 cmake_install.cmake
 CMakeCache.txt
 Makefile
-bin
-dist
 tags
-=======
-CMakeFiles
-CMakeCache.txt
-cmake_install.cmake
-Makefile
-src/configuration.hpp
-.DS_Store
-*.swo
-*.swp
->>>>>>> df8405f4e83febb81a5ce8f772bd7f5b9e9b6036