fix merge shit