planets version of pluto
conflict resolution for pluto.txt