<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=44140017" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/huey735">@huey735</a> for future reference...GitHub does weird things when the name of the branch you want to merge is also called <code>master</code> (case in point: <a href="https://github.com/bisq-network/bisq-website/commit/a054ec0c553a38ad53943e05d35088affe747850">here's my commit</a> that fixed the merge conflict...only made one small change, but there's a lot more there).</p>
<p>Next time please call your forked branch something different <g-emoji class="g-emoji" alias="slightly_smiling_face" fallback-src="https://github.githubassets.com/images/icons/emoji/unicode/1f642.png">🙂</g-emoji></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-website/pull/190?email_source=notifications&email_token=AJFFTNU5AGBX34G7DR2B7ADP75I3VA5CNFSM4H2TGVR2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2FSYUI#issuecomment-512437329">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNTS7I3FL2ARGMJSC4LP75I3VANCNFSM4H2TGVRQ">mute the thread</a>.<img src="https://github.com/notifications/beacon/AJFFTNUJKQUJ2UAP5C2MPCLP75I3VA5CNFSM4H2TGVR2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2FSYUI.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-website/pull/190?email_source=notifications\u0026email_token=AJFFTNU5AGBX34G7DR2B7ADP75I3VA5CNFSM4H2TGVR2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2FSYUI#issuecomment-512437329",
"url": "https://github.com/bisq-network/bisq-website/pull/190?email_source=notifications\u0026email_token=AJFFTNU5AGBX34G7DR2B7ADP75I3VA5CNFSM4H2TGVR2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD2FSYUI#issuecomment-512437329",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>