Thailand and Cambodia are bickering over their borders again. Can diplomacy prevent a return to war?

Both countries claim overlapping parts of the Gulf of Thailand with potentially lucrative oil and gas reserves. There is a peaceful path to resolve the dispute.