Fixup merge conflicts in util/libeay.num