diff --git a/Gemfile b/Gemfile
index 23a6a823..e501db29 100644
--- a/Gemfile
+++ b/Gemfile
@@ -57,11 +57,8 @@ gem 'bcrypt', '~> 3.1.7'
 gem 'sidekiq'
 
 # Pagination
-<<<<<<< HEAD
-gem 'kaminari', '~> 0.16.3' #:git => "git://github.com/amatsuda/kaminari.git", :branch => 'master'
-=======
 gem 'kaminari', '~> 0.16.3'
->>>>>>> ea4f50e77942a7ccaa988af4dedd8cb4665b59c7
+
 
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development