merged conflicts
Merged conflicts + pokemon tests