Updated metadata.xml to remove merge conflicts