More merge fixes with holdout and scheduler