Have the pair kissed and made up?