fixing merge conflict

Gemfile

@@ -45,9 +45,7 @@ group :test do
   gem 'guard'
   gem 'guard-unicorn'
   gem 'codecov', :require => false
-  # database_cleaner 1.5.1 which is compatible with Mongoid 5 has not been released
-  # to rubygems yet, so pull it from github.
-  gem 'database_cleaner', :git =>  'https://github.com/DatabaseCleaner/database_cleaner', :ref => 'b87f00320f8aa0f7e499d183128f05ce29cedc33'
+  gem 'database_cleaner', "~>1.5.1" 
 end
 
 gem 'newrelic_rpm'

Gemfile.lock

 GIT
-  remote: https://github.com/DatabaseCleaner/database_cleaner
-  revision: b87f00320f8aa0f7e499d183128f05ce29cedc33
-  ref: b87f00320f8aa0f7e499d183128f05ce29cedc33
-  specs:
-    database_cleaner (1.5.1)
-
-GIT
   remote: https://github.com/macdiesel/mongoid-tree
   revision: b381dd56f1b3b061df8f4b4181d5440dea1602d1
   specs:
@@ -49,6 +42,7 @@ GEM
       url
     coderay (1.0.7)
     dalli (2.1.0)
+    database_cleaner (1.5.1)
     delayed_job (4.1.1)
       activesupport (>= 3.0, < 5.0)
     delayed_job_mongoid (2.2.0)
@@ -175,7 +169,7 @@ DEPENDENCIES
   bundler
   codecov
   dalli
-  database_cleaner!
+  database_cleaner (~> 1.5.1)
   delayed_job
   delayed_job_mongoid
   enumerize