Weird merge conflict issue?