The unification of the warlords during the 1500s led to the end of the Warring States period. 
But the city's fortunes turned during the Warring States period (1467 1568), which was finally ended by the unifying warlords Nobunaga and Hideyoshi in the mid-16th century.