<p><g-emoji class="g-emoji" alias="point_up" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/261d.png">☝️</g-emoji> resolved the conflict with master and force pushed it</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/3961?email_source=notifications&email_token=AJFFTNSNIROCY3OQ464WUJDRCJ66FA5CNFSM4KSXWQO2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOELL6YWY#issuecomment-584576091">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNV2DO2AIPGH5SVQTLDRCJ66FANCNFSM4KSXWQOQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNTJ4X2M6ZQTIL2ZLPDRCJ66FA5CNFSM4KSXWQO2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOELL6YWY.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/3961?email_source=notifications\u0026email_token=AJFFTNSNIROCY3OQ464WUJDRCJ66FA5CNFSM4KSXWQO2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOELL6YWY#issuecomment-584576091",
"url": "https://github.com/bisq-network/bisq/pull/3961?email_source=notifications\u0026email_token=AJFFTNSNIROCY3OQ464WUJDRCJ66FA5CNFSM4KSXWQO2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOELL6YWY#issuecomment-584576091",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>