Is an end to the US-China trade conflict in sight?

Optimism that the US and China could be edging towards an agreement over trade has grown in recent weeks.