fixed conflict gem and gemfile lock

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/amatsuda/kaminari.git
-  revision: c3c853a944cd2bff072ae05e48c563b2c9a29597
+  revision: bc52ae73d41386d344b5d1b18e689e5a988f1a03
   branch: master
   specs:
     kaminari (1.0.1)
@@ -92,7 +92,9 @@ GEM
       railties (>= 3.2, < 5.2)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
+    httparty (0.15.5)
+      multi_xml (>= 0.5.2)
+    i18n (0.8.4)
     jbuilder (2.6.4)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2)
@@ -114,6 +116,9 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.2)
     multi_json (1.12.1)
+
+    multi_xml (0.6.0)
+
     mysql2 (0.4.6)
     nio4r (2.1.0)
     nokogiri (1.7.2)
@@ -124,7 +129,7 @@ GEM
       ttfunk (~> 1.5)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    puma (3.8.2)
+    puma (3.9.1)
     rack (2.0.3)
     rack-cors (0.4.1)
     rack-protection (2.0.0)
@@ -247,6 +252,7 @@ DEPENDENCIES
   factory_girl_rails (~> 4.0)
   faker
   font-awesome-rails
+  httparty (~> 0.15.5)
   jbuilder (~> 2.5)
   jquery-rails
   kaminari!
@@ -257,7 +263,6 @@ DEPENDENCIES
   puma (~> 3.0)
   rack-cors
   rails (~> 5.1.0)
-  redis (~> 3.0)
   rspec-rails (~> 3.5)
   sass-rails (~> 5.0)
   schema_to_scaffold