Restarting the merge conflict test