If automerge fails, signal a conflict and ask the user what to do.

• 如果自动合并失败了，标记冲突，告诉用户怎样做。