Last week's truce - merger, if you will - between rival discount cab ride apps Didi Chuxing and Uber China followed years of fierce competition. Here is the low-down on the proposed deal.

How will the revenue and voting rights be split in the combined Didi-Uber entity?

Uber Global will receive a 5.89 percent stake in the combined company along with "preferred equity interest", which is equal to a 17.7 percent stake. Uber China's investors, including Baidu Inc, will receive a 2.3 percent stake in the merged entity. Didi founder Cheng Wei and Uber Chief Executive Officer Travis Kalanick will join each other's boards.