diff --git a/.gitignore b/.gitignore
index e662ff9..ae0f34e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,7 +45,6 @@ compile_commands.json
 CTestTestfile.cmake
 _deps
 
-<<<<<<< HEAD
 # ---> C
 # Prerequisites
 *.d
@@ -100,5 +99,3 @@ Module.symvers
 Mkfile.old
 dkms.conf
 
-=======
->>>>>>> 106e5595630b47a33778a4571588a9f739f6a80b