<p></p>
<p>I think this merge conflict should be resolved once <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="630030547" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4280" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/4280/hovercard" href="https://github.com/bisq-network/bisq/pull/4280">#4280</a> is merged since I fixed the same conflict there</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/4314#issuecomment-653588275">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQRFISPATHI7FY5O7LRZXXV7ANCNFSM4N74I7MA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNXRNTQFJPGKG25JYUDRZXXV7A5CNFSM4N74I7MKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOE32POMY.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/4314#issuecomment-653588275",
"url": "https://github.com/bisq-network/bisq/pull/4314#issuecomment-653588275",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>