<p>I can rebase this to get rid of the new conflict, but it only makes sense to do so if there is a chance of it getting merged.</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/openstreetmap/openstreetmap-website/pull/2028?email_source=notifications&email_token=AAK2OLOC7OF522MFWH5DSQTPVFVJNA5CNFSM4F6HXSF2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVIKTMQ#issuecomment-491825586">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLKI3FTMWXYTBFMDEUTPVFVJNANCNFSM4F6HXSFQ">mute the thread</a>.<img src="https://github.com/notifications/beacon/AAK2OLJOW2NPODHEETWGDYLPVFVJNA5CNFSM4F6HXSF2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVIKTMQ.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/openstreetmap/openstreetmap-website/pull/2028?email_source=notifications\u0026email_token=AAK2OLOC7OF522MFWH5DSQTPVFVJNA5CNFSM4F6HXSF2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVIKTMQ#issuecomment-491825586",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/2028?email_source=notifications\u0026email_token=AAK2OLOC7OF522MFWH5DSQTPVFVJNA5CNFSM4F6HXSF2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVIKTMQ#issuecomment-491825586",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>