fixing some merge wonkiness