Merge conflict resolved

A wild HEAD appeared in newtest

Do you want to:
- FIGHT
- BAG
- POKÉMON
- RUN