diff --git a/tests/test_db_api.rb b/tests/test_db_api.rb
index ae0e0df..08b84f5 100644
--- a/tests/test_db_api.rb
+++ b/tests/test_db_api.rb
@@ -12,11 +12,8 @@ class DBAPITest < Test::Unit::TestCase
     @db = XGen::Mongo::Driver::Mongo.new(host, port).db('ruby-mongo-test')
     @coll = @db.collection('test')
     @coll.clear
-<<<<<<< HEAD:tests/test_db_api.rb
     @r1 = @coll.insert('_id' => new_oid, 'a' => 1)      # collection not created until it's used
-=======
     @r1 = @coll.insert('a' => 1) # collection not created until it's used
->>>>>>> 135a9ca0ab28335d8f9eaaa78fed7cc502d062df:tests/test_db_api.rb
     @coll_full_name = 'ruby-mongo-test.test'
   end