Merge Zoo and Tank