fixing merge conflict
fixing merge conflict

uchchishta/jobs,belenbarrospena/jobs,opensourcedesign/jobs,simonv3/osd-job-board,uchchishta/jobs,guaka/jobs,simonv3/osd-job-board,belenbarrospena/jobs,guaka/jobs,opensourcedesign/jobs