The former opponents appear to have made ammends