Merge adventure (24/26)

Merge adventure