Clean up various files

.gitignore

@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 # ---> KDevelop4
 #*.kdev4
 #.kdev4/
@@ -7,7 +5,6 @@
 # --->  build artifacts
 build/*
 
->>>>>>> master
 # ---> C++
 # Prerequisites
 *.d
@@ -54,10 +51,7 @@ build/*
 
 # Linker output
 *.ilk
-<<<<<<< HEAD
 *.map
-=======
->>>>>>> master
 *.exp
 
 # Precompiled Headers
@@ -99,7 +93,6 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-<<<<<<< HEAD
 # ---> CMake
 CMakeLists.txt.user
 CMakeCache.txt
@@ -112,8 +105,6 @@ install_manifest.txt
 compile_commands.json
 CTestTestfile.cmake
 _deps
-=======
 # CMake artifacts
 CMakeCache.txt
->>>>>>> master