Upper Austria had been rebellious for centuries, with 62 known uprisings between 1356 and 1849, 14 of which occurred in the 16th century. However, the Peasants' War of 1626 was the costliest in terms of human life and damage to livestock and property. The war caused Martin Aichinger to lose his farm and begin roaming the country. He eventually became a religious leader who led a popular revolt against aristocratic rule. His revolutionary ideas frightened the rulers so much that they tried to arrest him, leading to another series of uprisings that ended in the Battle on the Frankenberg  in 1636. All of Aichinger's followers were slaughtered during the battle, including the remaining women and children who had been in hiding.

Based on the above article, answer a question. What happened second: the Peasants' War or Battle on the Frankenberg?
Battle on the Frankenberg