clears the test file of the merge conflicts