<p>please resolve the conflicts so we can merge 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/3364?email_source=notifications&email_token=AJFFTNVTK3M5HALDG52S5DLQRQ45PA5CNFSM4I5HACNKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEC3C4AQ#issuecomment-548810242">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNX6SPR4VWP4EZN6CA3QRQ45PANCNFSM4I5HACNA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNXFAH3NKTYC2O22HVDQRQ45PA5CNFSM4I5HACNKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEC3C4AQ.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/3364?email_source=notifications\u0026email_token=AJFFTNVTK3M5HALDG52S5DLQRQ45PA5CNFSM4I5HACNKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEC3C4AQ#issuecomment-548810242",
"url": "https://github.com/bisq-network/bisq/pull/3364?email_source=notifications\u0026email_token=AJFFTNVTK3M5HALDG52S5DLQRQ45PA5CNFSM4I5HACNKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEC3C4AQ#issuecomment-548810242",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>