"But now we've worked things out."