I see a merge conflict in the diff below, I think a rebase should resolve this.
« Back to merge proposal
I see a merge conflict in the diff below, I think a rebase should resolve this.