diff --git a/.gitignore b/.gitignore
index 2b52a4956fc..68272c7d4d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,9 +9,6 @@ latest_updates.json
 dist/
 erpnext/docs/current
 *.swp
-<<<<<<< HEAD
 *.swo
 __pycache__
 *~
-=======
->>>>>>> master