Thailand and Cambodia on Wednesday reaffirmed their commitment to a ceasefire agreement following fresh fighting along their shared border, after China stepped in to mediate at an informal meeting in Shanghai.

A ceasefire between Cambodia and Thailand appears to be holding, hours after it came into effect at midnight local time (1 p.m. ET Monday), following days of clashes across the two countries’ disputed border.