Fix leftover merge conflict from stash
Fix leftover merge conflict from stash

PokeAPI/pokeapi,PokeAPI/pokeapi,mjhayes412/pokeapi,dhcrain/pokeapi,dhcrain/pokeapi,phalt/pokeapi,PokeAPI/pokeapi,phalt/pokeapi,mjhayes412/pokeapi,PokeAPI/pokeapi,mjhayes412/pokeapi,dhcrain/pokeapi,phalt/pokeapi