ChatGPT - Text Edit Conflict Resolution