Tens of thousands of people gathered in Cambodia’s capital Phnom Penh on Wednesday for a march to show their solidarity with the government and military, amid soaring tensions with neighboring Thailand following a border row that erupted last month.

As we share a long border, we both know that we have to live and grow together,” Thailand’s then-Ambassador to Cambodia Panyarak Poolthup told Cambodia’s then-Prime Minister Hun Sen. “The political will is always there to resolve any issues that may arise.

The two sides held talks in Phnom Penh over the weekend, which Thailand said had made progress, but the border row shows little sign of dying down.