Fix bad push / merge conflicts