fix merge revolt