diff --git a/test/schema.test.js b/test/schema.test.js
index 8ca18080..d26d2fad 100644
--- a/test/schema.test.js
+++ b/test/schema.test.js
@@ -1,11 +1,7 @@
 var db = getSchema(), slave = getSchema(), Model, SlaveModel;
 var should = require('should');
 
-<<<<<<< HEAD
-describe.skip('schema', function() {
-=======
-describe.only('schema', function() {
->>>>>>> feature-transactions
+describe('schema', function() {
 
     it('should define Model', function() {
         Model = db.define('Model');