fix some merge weirdness