fixed merge problems in dataverse.xhtml
Merge branch 'master' of https://github.com/IQSS/dataverse