Fixing merge conflict code