Fixed planet.xml so that it passes RSS feed validation
Resolved conflicts