Conflicted merge example