fixed conflict

Gemfile.lock

@@ -72,11 +72,15 @@ GEM
     capistrano-rails (1.4.0)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
+    capistrano3-puma (3.1.1)
+      capistrano (~> 3.7)
+      capistrano-bundler
+      puma (~> 3.4)
     carrierwave (1.3.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
       mime-types (>= 1.16)
-    chartkick (3.2.1)
+    chartkick (3.2.2)
     chronic (0.10.2)
     chunky_png (1.3.11)
     coffee-rails (4.2.2)
@@ -89,7 +93,7 @@ GEM
     concurrent-ruby (1.1.5)
     connection_pool (2.2.2)
     crass (1.0.5)
-    cups (0.1.10)
+    cups (0.0.7)
     database_cleaner (1.7.0)
     diff-lcs (1.3)
     erubi (1.9.0)
@@ -265,7 +269,7 @@ GEM
     simple_form (5.0.1)
       actionpack (>= 5.0)
       activemodel (>= 5.0)
-    spreadsheet (1.2.4)
+    spreadsheet (1.2.5)
       ruby-ole (>= 1.0)
     spring (2.1.0)
     spring-watcher-listen (2.0.1)
@@ -321,10 +325,11 @@ DEPENDENCIES
   capistrano-bundler
   capistrano-rails
   capistrano-rbenv!
+  capistrano3-puma
   carrierwave (~> 1.0)
   chartkick
   coffee-rails (~> 4.2)
-  cups
+  cups (~> 0.0.7)
   database_cleaner
   factory_girl_rails (~> 4.0)
   faker
@@ -370,6 +375,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
+
    ruby 2.4.1p111
 
 BUNDLED WITH