fix callidmerge_header and callidmerge_secret feature