finalized add job conflicts logic