<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/360803?s=20&v=4" /><strong>gravitystorm</strong> left a comment <a href="https://github.com/openstreetmap/openstreetmap-website/pull/6393#issuecomment-3303641879">(openstreetmap/openstreetmap-website#6393)</a></div>
<p dir="auto">Happy to merge, but there's a Gemfile.lock conflict now. You'll either need to rebase this, or teach me how to handle these situations cleanly.</p>
<p dir="auto">(I don't like merging and and fixing things up locally, in case I mess up the lockfile, but if there's a way to do it that updates the PR, keeps credit for the original author, and also runs CI, then I'm all ears 😄 )</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-3303641879">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLJDUQIMGFHAMAG4LQD3TGAGHAVCNFSM6AAAAACGPJ75TGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZTGMBTGY2DCOBXHE">unsubscribe</a>.<br />You are receiving this because you are subscribed to this thread.<img src="https://github.com/notifications/beacon/AAK2OLIV6NCTHXJBL4VAB2T3TGAGHA5CNFSM6AAAAACGPJ75TGWGG33NNVSW45C7OR4XAZNMJFZXG5LFINXW23LFNZ2KUY3PNVWWK3TUL5UWJTWE5GJRO.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/c3303641879</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-3303641879",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/6393#issuecomment-3303641879",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>