Fixed merge conflicts in TaskPasser