<p>I've just rebased the two commits to resolve the conflict, which appears to be simply due to a file rename: <em>TraderDisputeView</em> -> <em>DisputeView</em>.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/3251?email_source=notifications&email_token=AJFFTNTCLJYMH737L5YR3MLQKEWKVA5CNFSM4IWKZM5KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65U2VQ#issuecomment-532368726">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNTM54VBUVCZKAZW2UDQKEWKVANCNFSM4IWKZM5A">mute the thread</a>.<img src="https://github.com/notifications/beacon/AJFFTNVIDOOH7KDEWNNEFMLQKEWKVA5CNFSM4IWKZM5KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65U2VQ.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/3251?email_source=notifications\u0026email_token=AJFFTNTCLJYMH737L5YR3MLQKEWKVA5CNFSM4IWKZM5KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65U2VQ#issuecomment-532368726",
"url": "https://github.com/bisq-network/bisq/pull/3251?email_source=notifications\u0026email_token=AJFFTNTCLJYMH737L5YR3MLQKEWKVA5CNFSM4IWKZM5KYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65U2VQ#issuecomment-532368726",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>