ci: add check:merge:conflict job (#153)

* ci: add check:merge:conflict job

* split caches between test and release job
5 jobs for master in 15 minutes and 17 seconds