DOI Configuration
conflict resolved