<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=20237127" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/niyid">@niyid</a> Yes, those conflicts happened because your PR touches files that have been changed with the recent merges.<br>
My suggestion is to use <code>git pull upstream master --rebase</code>, so that you will be able to manually fix all conflicts.</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/3275?email_source=notifications&email_token=AJFFTNRCTD3FGXNPKCRTVULQKELINA5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65MCZA#issuecomment-532332900">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNTAWFVQN6RUUOROUZLQKELINANCNFSM4IXG65PA">mute the thread</a>.<img src="https://github.com/notifications/beacon/AJFFTNTHBC5UPXEKEW3D2BLQKELINA5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65MCZA.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/3275?email_source=notifications\u0026email_token=AJFFTNRCTD3FGXNPKCRTVULQKELINA5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65MCZA#issuecomment-532332900",
"url": "https://github.com/bisq-network/bisq/pull/3275?email_source=notifications\u0026email_token=AJFFTNRCTD3FGXNPKCRTVULQKELINA5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65MCZA#issuecomment-532332900",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>