changes jobs code
resolve conflicts