Coding agents are excellent at solving merge and rebase conflicts according to natural language instruction.