How do you want border conflict with Thailand solved?