fixed conflict

Gemfile

@@ -9,8 +9,7 @@ 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'
+gem 'mysql2', '>= 0.3.18', '< 0.5'
 
 #Use PosgreSQL
 gem 'pg'
@@ -44,9 +43,6 @@ gem 'to_xls-rails'
 #Reporting gem
 #gem 'compendium'
 
-# Pagination
-gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
-
 # Use jquery as the JavaScript library
 gem 'jquery-rails'
 # Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
@@ -61,7 +57,8 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'sidekiq'
 
 # Pagination
-gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
+gem 'kaminari', '~> 0.16.3'
+
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development