fixing errors
you can choose any pokemon
merge conflicts;