diff --git a/.gitignore b/.gitignore
index 9b40632..457c85a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
 .git
 www/participants/*/*.csv
 scripts/__pycache__/**
-<<<<<<< HEAD
-=======
-
->>>>>>> 221e577 (updated gitignore and footer)