无法解决Git中的冲突

Question

我想解决SourceTree中Git中的冲突，但是所有选项都显示为已禁用

执行Git状态似乎一切正常

On branch feature/Guerrilla_BG
Your branch is up-to-date with 'origin/feature/Guerrilla_BG'.
nothing to commit, working directory clean

但要执行位桶提取请求，我会看到此消息：

Conflict: Modified on Source, Modified on Target

This file is in a conflicted state. You will need to resolve the conflict manually before you can merge this pull request.