Matsumae clan
Outside of the siege of Osaka, and the later conflicts of the 1850s to 1860s, violence in the Edo period was restricted to small skirmishes in the streets, peasant rebellions, and the enforcement of maritime restrictions. Social tension in the Edo period brought a number of rebellions and uprisings, the largest of which was the 1638 Shimabara Rebellion. In the far north of the country, the island of Hokkaido was inhabited by Ainu villagers and Japanese settlers. In 1669, an Ainu leader led a revolt against the Matsumae clan who controlled the region, and it was the last major uprising against Japanese control of the region. It was put down in 1672. In 1789, another Ainu revolt, the Menashi–Kunashir Rebellion, was crushed.