fix merge and update soap