delete merge conflict file