Fixed merge conflict in example