fixed planet, player, marketplace
resolving merge