ChatGPT - Editing Conflict Resolution