fix weird merge flub