I don't think it has been resolved. It's been more delayed, I think. There's a *very* tentative equilibrium right now, IMO, that will rear up again.
I'm not too surprised by Bonarata showing back up. An ego like he was supposed to have wouldn't take well to being defeated on his home turf, and he's been used to getting everything he wants for several centuries. He'd almost *have* to do something to get back at them.