fix merge weirdness