Dumbledore and Grindelwald patched things up. While Grindelwald raises an army, Dumbledore works at bringing the Ministry down from the inside, using his position as a teacher to recruit powerful students and his position on the Wizengamot to get information kept from the public.When Dumbledore goes to 'duel' Grindelwald, they join forces and conquer the world.