Added "Waterbolt" and "Ice Lance" merge.