diff --git a/.gitignore b/.gitignore
index 01c4545..b58cca5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,5 @@
-
 # IDEs
 .vscode/
-<<<<<<< HEAD
 .idea/
 
 # Byte-compiled / optimized / DLL files
@@ -85,13 +83,3 @@ environment.sh
 
 # Cloud configure
 clouds.yaml
-
-
-
-=======
-*.sqlite3
-recircle/clouds.yaml
-environment.sh
-.idea/
-__pycache__
->>>>>>> 126834316017d9a2654cc913e7eec8a47fee93e6