Batch update
Batch update
No significant change to Pokemon.java
Fixed merge conflicts