Thousands of displaced people in Cambodia and Thailand are returning home after a nearly week-long clash