job_card index error removed
merge conflict fix
conflict removed