removes merge conflict file