ignoring jobs.edn
handling merge errors