fix some incorrect automerges