diff --git a/.gitignore b/.gitignore
index 5368cd9..4880441 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,5 @@ models/
 *.mp4
 venv
 *.engine
-<<<<<<< HEAD
 *.log
-=======
 *.pyc
-
->>>>>>> 6146f2b (train fixes)