Thailand and Cambodia military officials have reached an uneasy ceasefire after a week of fighting along a disputed border, officials say.
Reports overnight claimed there was a further exchange of gunfire despite the truce agreement.
Political relations between the neighbouring countries also remain tense.
Both countries said the truce was struck following talks between the two militaries but not before one Thai soldier and one civilian were killed and 11 troops wounded in a new round of border fighting between Thai and Cambodian forces throughout Wednesday night.
Each side has accused the other of starting the violence, which has displaced thousands of villagers.
The deal came after a seventh day of fighting around the temples of Ta Krabey and Ta Moan.
"After discussions by the military on both sides this morning, there is a ceasefire agreement… border checkpoints will be re-opened and villagers will start to return home," said a Thai government spokesman.
The fighting erupted on April 22 and spread briefly to a third location – the flashpoint hilltop temple of Preah Vihear – on Tuesday.
