diff --git a/.gitignore b/.gitignore
index 7bdf3002..ed3f6e73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,12 +7,9 @@
 *.so
 *.so.*
 *.exe
-<<<<<<< Updated upstream
 *.dll
 *.class
 *.jar
-=======
->>>>>>> Stashed changes
 
 qemu/config-all-devices.mak