diff --git a/.gitignore b/.gitignore
index 20c94db..cbd5a62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,30 +3,8 @@
 *.pid
 *.tmp
 *.secret
-<<<<<<< HEAD
-
-# TODO: should be unnecessary once color generation is homegrown
-/colors/gen/vendor
-/colors/gen/tmp
-
-# keep the pipelines but hide their results
-/bin/pipelines/*/*/*
-
-# a place to keep secrets per-env
-/env/*/.hidden
-
-# ... and a place to keep shared secrets
-/env/.hidden
-||||||| 0d0e131
-/.repositories
-/.env/
-=======
 fishd.tmp.*
 
-# TODO: should be unnecessary once color generation is homegrown
-/colors/gen/vendor
-/colors/gen/tmp
-
 # keep the pipelines but hide their results
 /bin/pipelines/*/*/*
 
@@ -35,4 +13,7 @@ fishd.tmp.*
 
 # ... and a place to keep shared secrets
 /env/.hidden
->>>>>>> master
+
+# TODO: should be unnecessary once color generation is homegrown
+/colors/gen/vendor
+/colors/gen/tmp