hcrypto: Tidy up some merge conflicts