merge conflict file removed