diff --git a/.gitignore b/.gitignore
index 3fc3c1b9c..9cd427913 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,7 +52,6 @@ cypress.env.json
 /apps/**/cypress/reports/
 /apps/**/cypress/downloads/
 /apps/**/fixtures/wallet/node**
-<<<<<<< HEAD
 
 # apps/trading/e2e
 __pycache__/