On October 6th it issued a joint statement with the foreign partners saying they had settled their differences, without amending the Investment Agreement.

ECONOMIST: A massive mining project hits a snag

Entrepreneur David Ji's Chinese accusers keep telling the world they've settled their commercial differences with him.

FORBES

Facebook and Zynga settled their differences last year when they signed a five-year partnership agreement, though Facebook's priorities could change over time.

WSJ: HEARD ON THE STREET: Zynga Wants to Be More Than Just a Facebook Friend

Search expert John Battelle said in his blog post that social search would mean little until Facebook and Google settled their differences and offered consumers what they really wanted - Facebook data integrated with Google's search.

BBC: Screenshot of Google+