fixing some merge weirdness