Merge with Arena Prototype