Resolve merge conflicts when adding version 2.1.2 info
Resolve merge conflicts when adding version 2.1.2 info

BHITS/Consent2Share,BHITS/Consent2Share,BHITS/Consent2Share,BHITS/Consent2Share,bhits-dev/consent2share,BHITS/Consent2Share