This is not a recent dispute. The argument between Thailand and Cambodia dates back more than a century, when the borders of the two nations were drawn after the French occupation of Cambodia.
Hostilities escalated in 2008, when Cambodia tried to register an 11th Century temple located in the disputed area as a Unesco World Heritage Site. The move was met with heated protest from Thailand.
Over the years there have been sporadic clashes, with soldiers and civilians killed on both sides.
The latest tensions ramped up in May, after a Cambodian soldier was killed in a clash. This plunged relations between the countries to their lowest point in more than a decade.
In the run up to the first bout of fighting in July, both nations had imposed border restrictions. Cambodia banned imports from Thailand, including fruit and vegetables, power supplies and internet services.
Both countries had also strengthened troop presence along the border in recent weeks.