Fix package.xml
Fix duplicate package.xml entries