diff --git a/backend.dockerfile b/backend.dockerfile
index 177094a..54603c8 100644
--- a/backend.dockerfile
+++ b/backend.dockerfile
@@ -1,5 +1,6 @@
 FROM php:7.0-apache
 
+<<<<<<< HEAD
 ARG API_URL
 
 ARG MYSQL_DATABASE
@@ -45,6 +46,17 @@ RUN chmod +x /usr/local/bin/wp
 
 COPY docker/php/setup.sh /init-scripts/
 RUN chmod +x /init-scripts/setup.sh
+=======
+ARG WP_DB_NAME
+ARG WP_DB_USER
+ARG WP_DB_PASSWORD
+ARG WP_DB_HOST
+
+ENV WP_DB_NAME=${WP_DB_NAME} \
+    WP_DB_USER=${WP_DB_USER} \
+    WP_DB_PASSWORD=${WP_DB_PASSWORD} \
+    WP_DB_HOST=${WP_DB_HOST}
+>>>>>>> environment fix
 
 RUN docker-php-ext-install pdo pdo_mysql mysqli
 RUN a2enmod rewrite ssl
@@ -65,4 +77,4 @@ COPY docker/php/.htaccess /var/www/html/
 
 RUN chown -R www-data:www-data /var/www/html
 
-CMD /init-scripts/setup.sh
\ No newline at end of file
+CMD /init-scripts/setup.sh
diff --git a/backend/wp-config.php b/backend/wp-config.php
index e557ed4..5e5ec6b 100644
--- a/backend/wp-config.php
+++ b/backend/wp-config.php
@@ -1,9 +1,9 @@
-<?php
-/**
- * Do not edit this file. Edit the config files found in the config/ dir instead.
- * This file is required in the root directory so WordPress can find it.
- * WP is hardcoded to look in its own directory or one directory up for wp-config.php.
- */
-require_once(__DIR__ . '/vendor/autoload.php');
-require_once(__DIR__ . '/config/application.php');
-require_once(ABSPATH . 'wp-settings.php');
+<?php
+/**
+ * Do not edit this file. Edit the config files found in the config/ dir instead.
+ * This file is required in the root directory so WordPress can find it.
+ * WP is hardcoded to look in its own directory or one directory up for wp-config.php.
+ */
+require_once(__DIR__ . '/vendor/autoload.php');
+require_once(__DIR__ . '/config/application.php');
+require_once(ABSPATH . 'wp-settings.php');
diff --git a/environment.env b/dev.env
similarity index 100%
rename from environment.env
rename to dev.env
diff --git a/frontend.dockerfile b/frontend.dockerfile
index 4834fd4..77bb2f2 100644
--- a/frontend.dockerfile
+++ b/frontend.dockerfile
@@ -1,4 +1,5 @@
 FROM php:7.0-apache
+
 ARG API_URL
 ENV REACT_APP_API_URL ${API_URL}