scheduler: fix the merge conficts