"We've actually resolved our differences."