added the number of planets
fixed merge conflict in mergeme.txt