fix problems caused by merge weirdness