I resolved our differences and now we're good