merge error commit