diff --git a/.gitignore b/.gitignore
index e29a92131..1e943347d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@ genesis.ssz
 
 # IntelliJ
 /*.iml
-<<<<<<< HEAD
-
 # VSCode
 /.vscode
 .idea