and then somewhere in the middle of it , they had incorporated themselves into the isiroans and then the war ended with an unsteady truce that was probably all but violated with willow 's kidnapping .