need to fix create a job
fixed merge conflict in the job model