committed a bad merge