diff --git a/‎test/tests/index.js‎
Lines changed: 7 additions & 0 deletions b/‎test/tests/index.js‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎test/utils/index_setup.js‎
Lines changed: 15 additions & 11 deletions b/‎test/utils/index_setup.js‎
Lines changed: 15 additions & 11 deletions
@@ -329,6 +329,13 @@ describe("Index", function() {
           fileName
         );
       })
+      .then(function() {
+        return repo.openIndex();
+      })
+      .then(function(conflictedIndex) {
+        assert.ok(conflictedIndex.hasConflicts());
+        return conflictedIndex.conflictGet(fileName);
+      })
       .then(function(indexEntries) {
         // Store all indexEntries for conflict
         ancestorIndexEntry = indexEntries.ancestor_out;
 
@@ -1,4 +1,3 @@
-var assert = require("assert");
 var NodeGit = require("../../");
 var path = require("path");
 var promisify = require("promisify-node");
@@ -80,20 +79,25 @@ var IndexSetup = {
           checkoutStrategy: NodeGit.Checkout.STRATEGY.FORCE
         };
 
-        return NodeGit.Checkout.head(repository, opts);
+        return repository.checkoutBranch(ourBranchName, opts);
       })
       .then(function() {
-        return repository.mergeBranches(ourBranchName, theirBranchName);
+        return NodeGit.AnnotatedCommit.fromRef(repository, theirBranch);
       })
-      .then(function(commit) {
-        assert.fail(commit, undefined,
-          "The index should have been thrown due to merge conflicts");
+      .then(function(theirAnnotatedCommit) {
+        var checkoutOpts = {
+          checkoutStrategy: NodeGit.Checkout.STRATEGY.SAFE
+          | NodeGit.Checkout.STRATEGY.RECREATE_MISSING
+        };
+        return NodeGit.Merge.merge(
+          repository,
+          theirAnnotatedCommit,
+          null,
+          checkoutOpts
+        );
       })
-      .catch(function(index) {
-        assert.ok(index);
-        assert.ok(index.hasConflicts());
-
-        return index.conflictGet(fileName);
+      .then(function() {
+        return repository.openIndex();
       });
   }
 };