fixed conflict

Gemfile

@@ -1,5 +1,7 @@
 source 'https://rubygems.org'
-# ruby '2.3.1'
+
+# ruby '2.4.1'
+
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
@@ -44,7 +46,12 @@ gem 'mini_magick'
 gem 'jquery-fileupload-rails', '~> 0.4.7'
 
 #Report and Printing gems
+<<<<<<< HEAD
 gem 'cups', '~> 0.0.7'
+=======
+#gem 'cups' #remove for cloud installation
+gem 'cups', '~>0.0.7'
+>>>>>>> r-1902001-01
 gem 'prawn'
 gem 'prawn-table'
 gem 'prawn-qrcode'
@@ -114,6 +121,7 @@ group :development do
   gem 'capistrano-bundler'
   gem 'capistrano-rails'
   gem 'capistrano-rbenv', github: "capistrano/rbenv"
+  gem 'capistrano3-puma'
 end
 
 group :test do