fixed conflict

Gemfile

@@ -9,13 +9,10 @@ end
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.1.0'
 # Use mysql as the database for Active Record
-
 gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
-
-#gem 'pg'
-
+gem 'pg'
 
 # redis server for cable
 # gem 'redis', '~> 3.0'
@@ -61,8 +58,10 @@ gem 'sidekiq'
 
 # Pagination
 gem 'kaminari', '~> 0.16.3'
+
 # Datatable
 gem 'filterrific'
+
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
@@ -94,4 +93,4 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'httparty', '~> 0.15.5'
 
-gem 'bootstrap-datepicker-rails'
+gem 'bootstrap-datepicker-rails'