Fix bad part of a merge