fixed conflict gem and gemfile lock

Gemfile

@@ -9,13 +9,14 @@ 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'
 
 # redis server for cable
-gem 'redis', '~> 3.0'
+# gem 'redis', '~> 3.0'
 
 # Use Puma as the app server
 gem 'puma', '~> 3.0'
@@ -59,6 +60,9 @@ gem 'bcrypt', '~> 3.1.7'
 
 gem 'sidekiq'
 
+# Pagination
+gem 'kaminari', :git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
+
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
@@ -87,3 +91,5 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+gem 'httparty', '~> 0.15.5'