merge conflicts on scheduler