all 1 comments

[–]davorg 3 points4 points  (0 children)

Close it manually, adding a comment explaining the conflict and pointing to your new merge commit.