fix auto merge