 With conflict concentrated in the capital, Guadalajara experienced relative calm.After the Cristero Conflict, peace returned to Guadalajara and the city flourished, outgrowing its colonial roots.This period saw the birth of new schools of architecture that would decorate the city from the 1920s to the 1980s.