diff --git a/.gitignore b/.gitignore
index c5e76f7..989e2ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@ Pictures/
 dev/
 nas
 .cache/
-<<<<<<< HEAD
 .python_history
 .aws
 .local
@@ -20,6 +19,3 @@ nas
 .arkade/
 .cubestore
 .docker
-=======
-.python_history
->>>>>>> 134c6c8 (reorganization)