Missed part of a merge conflict