(updated) Mario/Wario Merge