diff --git a/.gitignore b/.gitignore
index 0bf55c9..1f0cc4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,10 +10,5 @@
 /.env
 /imgui.ini
 
-<<<<<<< HEAD
 Playertracker
 *.json
-=======
-PlayerTracker
-compile_commands.json
->>>>>>> 0bb2efb088e7b2a81fec42ce54518f21ac4a9101