diff --git a/backend/settings.py b/backend/settings.py
index 3ef845c..e4de038 100644
--- a/backend/settings.py
+++ b/backend/settings.py
@@ -114,31 +114,14 @@ WSGI_APPLICATION = 'backend.wsgi.application'
 # Database
 # https://docs.djangoproject.com/en/5.0/ref/settings/#databases
 
-""" DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'mcduck', # Поставлено как пример
-        'USER': 'postgres',
-        'PASSWORD': 'swydk', # Поставлено как пример
-        'HOST': 'localhost', 
-        'PORT': '5432',
-    }
-} """
 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',
     }
 }