Thailand and Cambodia say they will return to agreed border positions after fatal clash