Job datatable issue resolved
Conflicts resolved