<p></p>
<p>I resolved the conflict from the web interface this time. (Perhaps it would have been better to do a rebase - I'm not sure.)</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/5000#issuecomment-763492960">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQ7EFODMOBMCSCIDV3S22TV3ANCNFSM4VIT74IQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNVMEAVVGTGRWHVU7ETS22TV3A5CNFSM4VIT74I2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOFWA7UYA.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/5000#issuecomment-763492960",
"url": "https://github.com/bisq-network/bisq/pull/5000#issuecomment-763492960",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>