Updated the dc compostie xml file and merged conflicts