<p><a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=170962" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/ripcurlx">@ripcurlx</a> <a class="user-mention" data-hovercard-type="user" data-hovercard-url="/hovercards?user_id=23560607" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/sqrrm">@sqrrm</a></p>
<p>The conficts I am seeing above seem to be transient or recently occurring. For instance in the case of <strong><code>bisq.desktop.main.account.AccountView</code></strong> refer to the screenshots below: one screen shows the same class file in Green in the PR diff page while the "Resolve conflicts" button shows recent addition of package imports.</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=AJFFTNQNWLC7JCV4BPBYMUDQKEB65A5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65EOGQ#issuecomment-532301594">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNX5L3HNWJZMYCJQ3JDQKEB65ANCNFSM4IXG65PA">mute the thread</a>.<img src="https://github.com/notifications/beacon/AJFFTNSBYPYGGV4D34UGKPDQKEB65A5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65EOGQ.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=AJFFTNQNWLC7JCV4BPBYMUDQKEB65A5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65EOGQ#issuecomment-532301594",
"url": "https://github.com/bisq-network/bisq/pull/3275?email_source=notifications\u0026email_token=AJFFTNQNWLC7JCV4BPBYMUDQKEB65A5CNFSM4IXG65PKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD65EOGQ#issuecomment-532301594",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>