fix merge funnyness