ctest: fixed pushing packages, libhexbus: fixed merge conflicts