more stuff
revising job json
merge + conflict resolution