diff --git a/.gitignore b/.gitignore
index f1f3da5a5c..b7121fe8fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ignore misc BYOND files
 Thumbs.db
 vchat.db
@@ -23,40 +22,7 @@ cfg/
 !/.vscode/settings.json
 !/.vscode/tasks.json
 
-code/game/gamemodes/technomancer/spells/projectile/overload.dm
-code/game/gamemodes/technomancer/spells/projectile/overload.dm
-code/modules/client/preference_setup/loadout/loadout_xeno.dm
 temp.dmi
 
 node_modules/
 package-lock.json
-=======
-#ignore misc BYOND files
-Thumbs.db
-vchat.db
-vchat.db*
-*.log
-*.int
-*.rsc
-*.dmb
-*.lk
-*.backup
-*.before
-*.pyc
-*.pid
-data
-data/
-cfg/
-
-#Visual studio stuff
-*.vscode/*
-!/.vscode/launch.json
-!/.vscode/extensions.json
-!/.vscode/settings.json
-!/.vscode/tasks.json
-
-temp.dmi
-
-node_modules/
-package-lock.json
->>>>>>> 2d854312ad... Merge pull request #13549 from Cameron653/git-stop-ignoring