Ending a Conflict Feud!

Major events

 * Cinccino returns back to Josie's team.
 * Elizabeth's Vanillish evolves into Vanilluxe, and learns Freeze-Dry.