Fix merge conflicts

Dockerfile.dev

@@ -18,8 +18,8 @@ RUN su -c "bundle config github.https true; cd /var/www && bundle install --path
 
 WORKDIR /var/www
 USER web
-
-RUN bundle config github.https true; cd /var/www && bundle install --path /var/bundle --jobs 4
+    
+RUN bundle config github.https true; cd /var/www && bundle install -- path /var/bundle --jobs 4
 
 USER root
 CMD ["/var/www/script/entry.sh"]

config/puma.rb

@@ -1,5 +1,5 @@
 require "dotenv"
-Dotenv.load
+Dotenv.load()
 
 base_path = (ENV['DEPLOY_PATH'] || Dir.pwd)
 #current_path = "#{base_path}/current"

docker-compose.dev.yml

@@ -22,7 +22,7 @@ services:
     # Debugd
     #    command: bash 
     #tty: true
-    command: mysqld_safe --skip-grant-tables
+    #    command: mysqld_safe --skip-grant-tables
     image: mariadb:latest
     volumes:
      - "./db_data:/var/lib/mysql"