The warlords Hideyoshi and Nobunaga became friends after the Warring States period ended. 
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.