ChatGPT - Branch conflict resolution