diff --git a/.gitignore b/.gitignore
index 1452265e..ba220b1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,11 +38,7 @@ BP_Revolute
 # Precompiled Assets
 SourceArt/**/*.png
 SourceArt/**/*.tga
-<<<<<<< HEAD
 
-
-=======
->>>>>>> main
 # Builds
 Build/*
 Builds/*