diff --git a/site/config/settings.py b/site/config/settings.py
index edfa4611..1ef52354 100644
--- a/site/config/settings.py
+++ b/site/config/settings.py
@@ -98,18 +98,6 @@ DATABASES = {
     }
 }
 
-<<<<<<< HEAD
-# DATABASES = {
-#     'default': {
-#         'ENGINE' : 'django_cockroachdb',
-#         'NAME' : 'spaceout',
-#         'USER' : 'spaceout',
-#         'PASSWORD': 'spaceout',
-#         'HOST' : 'localhost',
-#         'PORT' : 35767,
-#     }
-# }
-=======
 #DATABASES = {
 #    'default': {
 #        'ENGINE' : 'django_cockroachdb',
@@ -120,7 +108,6 @@ DATABASES = {
 #        'PORT' : 35767,
 #    }
 #}
->>>>>>> 07ec7ef3fe47bc84bac30aa9e368410217511f88
 
 
 # Password validation