For now, it appears the dispute has come to a resolution - sort of.
He thought the dispute had finally come to a satisfactory end.
The dispute came to a head in the last two weeks.
The dispute comes when both the state and national Democratic organizations are going through difficult financial times, if for different reasons.
A dispute with franchisees came to a head in 1962.
"This is mostly where the dispute comes from," she said.
A third dispute came less than a week later, as the teams prepared to race in Hungary.
The dispute comes at a time of transition on both sides.
The legal dispute comes at a bad time for the ambassador.
But as officials took the stand Thursday and today, the dispute came to a boil.