Fix failed conflict merge