pokemon edit
stupid merge