Cambodia-Thailand conflict persists despite Trump peace push