<p><b>@freimair</b> requested changes on this pull request.</p>

<p>please resolve the merge conflict</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/3326?email_source=notifications&email_token=AJFFTNVA6IDFCBJNGYF5ZJDQUKFS3A5CNFSM4I2LUKX2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCL4PMNI#pullrequestreview-318305845">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQR7LHAN6IHYPKJVH3QUKFS3ANCNFSM4I2LUKXQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNUYL5ADWXO5TW6HDSLQUKFS3A5CNFSM4I2LUKX2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCL4PMNI.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/3326?email_source=notifications\u0026email_token=AJFFTNVA6IDFCBJNGYF5ZJDQUKFS3A5CNFSM4I2LUKX2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCL4PMNI#pullrequestreview-318305845",
"url": "https://github.com/bisq-network/bisq/pull/3326?email_source=notifications\u0026email_token=AJFFTNVA6IDFCBJNGYF5ZJDQUKFS3A5CNFSM4I2LUKX2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCL4PMNI#pullrequestreview-318305845",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>