Merge conflict repair