Abide by the International Court on boundaries even if need to get surveyed by non aligned country (ies)
open the border, have a tea party together & get on with living & as everybody knows Thailand does very well thankyou, not just on border trade but trade in general along with tourist traffic, which they need desperately at present.
The old fuddy duddies who insist on making waves on 3 areas that happen to have old Kymer ruins on (& belong to Cambodia anyway) should be drafted to the front line & given an old Lee Enfield to protect the ruins.