diff --git a/src/djangoblog/settings.py b/src/djangoblog/settings.py
index a3e0cb2..d850f61 100644
--- a/src/djangoblog/settings.py
+++ b/src/djangoblog/settings.py
@@ -109,24 +109,14 @@ WSGI_APPLICATION = 'djangoblog.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-<<<<<<< HEAD
         'NAME': 'django_blog',
         'USER': 'root',
-        'PASSWORD': '258066',
-        'HOST': 'localhost',
-        'PORT': '3306',
-    }
-}
-=======
-        'NAME': 'djangoblog',
-        'USER': 'root',
-        'PASSWORD':'123456',
+        'PASSWORD':'258066',
         'HOST': '127.0.0.1',
         'PORT': 3306,
         'OPTIONS': {
             'charset': 'utf8mb4'},
     }}
->>>>>>> 9d75c2cc35cb9cd994d2020c2a2ecbf0104939b6
 
 # Password validation
 # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators