user
merge
trainers/template/pokemon update