Just when we thought our heroes were finally getting along…