fix merge thing