fix merge weirdness
more oddities