diff --git a/.gitignore b/.gitignore
index 65e2f8a..76cbdaf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,10 +160,5 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
-<<<<<<< HEAD
-config/*
-db/*
-=======
 config/
 db/
->>>>>>> for_psql