箱館戦争
The conflict continued until the rebels' defeat at the Battle of Hakodate in May 1869.