<div style="display: flex; flex-wrap: wrap; white-space: pre-wrap; align-items: center; "><img height="20" width="20" style="border-radius:50%; margin-right: 4px;" decoding="async" src="https://avatars.githubusercontent.com/u/147741?s=20&v=4" /><strong>tomhughes</strong> left a comment <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6393#issuecomment-3304650888">(openstreetmap/openstreetmap-website#6393)</a></div>
<p dir="auto">There was no "mistake" here, just a merge conflict. It's completely normal for the person merging to fix those as part of the merge and the merge commit (where the fix is) will already be attributed to the person doing the merge.</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />Reply to this email directly, <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6393#issuecomment-3304650888">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLPDODAS4MESMNJSJ7L3THIXLAVCNFSM6AAAAACGPJ75TGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTGMBUGY2TAOBYHA">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLKJLHKVRVKOPLCG5ND3THIXLA5CNFSM6AAAAACGPJ75TGWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTWE7D4IQ.gif" height="1" width="1" alt="" /><span style="color: transparent; font-size: 0; display: none; visibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-width: 0; max-height: 0; mso-hide: all">Message ID: <span><openstreetmap/openstreetmap-website/pull/6393/c3304650888</span><span>@</span><span>github</span><span>.</span><span>com></span></span></p>

<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/openstreetmap/openstreetmap-website/pull/6393#issuecomment-3304650888",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/6393#issuecomment-3304650888",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>