diff --git a/docker-compose.yml b/docker-compose.yml
index 3b446101..ac4619dd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,20 @@
 version: '3.5'
 services:
+
+  # Legacy MySQL DB
+  mysql_db:
+    image: mysql:5.7
+    ports:
+      - "3306:3306"
+    environment:
+      MYSQL_DATABASE: dev
+      MYSQL_USER: dev
+      MYSQL_PASSWORD: octosecret123
+      MYSQL_ROOT_PASSWORD: rootPassword
+    volumes:
+      - .:/code
+      - gm-mysql_db:/var/lib/mysql
+
   # PostgreSQL database
   db:
     build:
@@ -86,6 +101,7 @@ services:
       - DB_USERNAME=postgres
       - DB_PASSWORD=postgres
     depends_on:
+      - mysql_db
       - db
 #      - rabbitmq
       - redis
@@ -99,6 +115,9 @@ services:
       - "8000:8000"
 
 volumes:
+  gm-mysql_db:
+    name: gm-mysql_db
+
   gm-db:
     name: gm-db
 
diff --git a/project/settings/base.py b/project/settings/base.py
index 69f601d7..6c52afe6 100644
--- a/project/settings/base.py
+++ b/project/settings/base.py
@@ -155,7 +155,7 @@ DATABASES = {
     'legacy': {
         'ENGINE': 'django.db.backends.mysql',
         # 'HOST': '172.23.0.1',
-        'HOST': '172.17.0.1',
+        'HOST': '127.0.0.1',
         'PORT': 3306,
         'NAME': 'dev',
         'USER': 'dev',
diff --git a/requirements/base.txt b/requirements/base.txt
index 538cbe52..7de1517e 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -33,11 +33,10 @@ django-elasticsearch-dsl>=7.0.0,<8.0.0
 django-elasticsearch-dsl-drf==0.20.2
 sentry-sdk==0.11.2
 
-<<<<<<< HEAD
+
 mysqlclient==1.4.4
-=======
+
 # temp solution
 redis==3.2.0
 amqp>=2.4.0
 celery==4.3.0rc2
->>>>>>> develop