resolved merge conflicts
merged and removed broken hint-crc32