managing jobs
fixed conflicts