diff --git a/.gitignore b/.gitignore
index b719b51..98573b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ __pycache__
 .server-setup
 .env
 out
-<<<<<<< HEAD
 
 # kubernetes/
 build.log