Fix bad commit merge