diff --git a/.gitignore b/.gitignore
index a1b615b..71b1187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,10 +19,5 @@ experiments/
 andy_*.json
 jill_*.json
 src/models/logs/*
-<<<<<<< HEAD
-server_data/*
-server_data_*/*
-=======
 server_data*
 results/*
->>>>>>> d70491e5974a973b96c47f0515c2722b82c9b253