Those two pokemon stopped fighting and became friends at the end which was so sweet after all that bickering over the berries