Original: The distinction between Æsir and Vanir is relative, for the two are said to have made peace, exchanged hostages, intermarried and reigned together after the events of the Æsir-Vanir War, and afterward the gods are generally referred to collectively as Æsir.
Simplified: After a long war, the Æsir and Vanir made peace and joined together.