fix merge for real