<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/users/sqrrm/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/sqrrm">@sqrrm</a> ah yeah the commas <g-emoji class="g-emoji" alias="sweat" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/1f613.png">😓</g-emoji> okay I resolved 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/3859?email_source=notifications&email_token=AJFFTNXVTWMTD3NZVA3BWCDQ4L3IJA5CNFSM4KC5INQKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIE5HGY#issuecomment-571069339">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNS5QFUGW7VKDHJ5YIDQ4L3IJANCNFSM4KC5INQA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNSG3GPMHTCZ4X35UH3Q4L3IJA5CNFSM4KC5INQKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIE5HGY.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/3859?email_source=notifications\u0026email_token=AJFFTNXVTWMTD3NZVA3BWCDQ4L3IJA5CNFSM4KC5INQKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIE5HGY#issuecomment-571069339",
"url": "https://github.com/bisq-network/bisq/pull/3859?email_source=notifications\u0026email_token=AJFFTNXVTWMTD3NZVA3BWCDQ4L3IJA5CNFSM4KC5INQKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEIE5HGY#issuecomment-571069339",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>