diff --git a/.gitignore b/.gitignore
index 50ea95d8..fe0e53a0 100755
--- a/.gitignore
+++ b/.gitignore
@@ -33,5 +33,8 @@ nest.conf
 ipchange.yaml
 ip_bans.yaml
 production_auth.json
+<<<<<<< HEAD
 
 
+=======
+>>>>>>> cd3d35d41e65e707044ab7c865ab2f343a3e0a07