diff --git a/.gitignore b/.gitignore
index 58996e1..45805d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,8 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
-<<<<<<< HEAD
 .tmp
 
-=======
->>>>>>> main
 # User-specific files
 *.rsuser
 *.suo