diff --git a/backend/settings.py b/backend/settings.py
index ddebe43..3ef845c 100644
--- a/backend/settings.py
+++ b/backend/settings.py
@@ -128,10 +128,17 @@ import os
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql',
+<<<<<<< HEAD
         'NAME': 'mydatabase',
         'USER': 'myuser',
         'PASSWORD': 'mypassword',
         'HOST': 'db',
+=======
+        'NAME': '',
+        'USER': 'postgres',
+        'PASSWORD': 'swydk',
+        'HOST': 'localhost',
+>>>>>>> 50e3fec210db2b31b8f409658469cecde47a8cac
         'PORT': '5432',
     }
 }