original merge conflict file