Fix bad commit/merge