diff --git a/t/15-merge.t b/t/15-merge.t
index 512cc147..479ebf7c 100644
--- a/t/15-merge.t
+++ b/t/15-merge.t
@@ -149,9 +149,12 @@ $index -> remove_conflict('test1');
 is $index -> has_conflicts, 0;
 
 $index -> conflict_cleanup;
+$repo -> state_cleanup;
 write_file($file1, 'this is file1 on branch1');
 $index -> add('test1');
+$index -> write();
 
+is $index -> has_conflicts, 0;
 $repo -> merge($branch2);
 is $index -> has_conflicts, 1;