fixed Planet.java conflict