Missed some of the merge conflict