diff --git a/.gitignore b/.gitignore
index 23109dd28..91270239a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,10 +22,6 @@ tests/core/pyspec/eth2spec/bellatrix/
 tests/core/pyspec/eth2spec/capella/
 tests/core/pyspec/eth2spec/deneb/
 tests/core/pyspec/eth2spec/electra/
-<<<<<<< HEAD
-=======
-tests/core/pyspec/eth2spec/eip7549/
->>>>>>> dev
 tests/core/pyspec/eth2spec/whisk/
 tests/core/pyspec/eth2spec/eip7251/
 tests/core/pyspec/eth2spec/eip7594/