Merge "Yangman history and collections tab"