The two countries have agreed to resolve their outstanding claims in the Gulf of Thailand, but will be forced to negotiate their way around a host of nationalist tripwires.

This post was originally published on The Diplomat.