updating jobs
updating conflicts