Example of merge conflict