Fixed issue with conflick in job model<<<<HEAD