Fix bad common merge