libcintelhex-git: add
gem2arch: remove conflict to pkgtools (they removed gem2arch)