<p>Hope you don't mind. I resolved the merge 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/openstreetmap/openstreetmap-website/pull/2204?email_source=notifications&email_token=AAK2OLKOPQMD2X4V7UYXQJDPZ2YCLA5CNFSM4HE2LHC2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODXLCUUA#issuecomment-500574800">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AAK2OLMMCQ3KW6BMO7GR4YDPZ2YCLANCNFSM4HE2LHCQ">mute the thread</a>.<img src="https://github.com/notifications/beacon/AAK2OLMZVO777CS3K6UKJJLPZ2YCLA5CNFSM4HE2LHC2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODXLCUUA.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/2204?email_source=notifications\u0026email_token=AAK2OLKOPQMD2X4V7UYXQJDPZ2YCLA5CNFSM4HE2LHC2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODXLCUUA#issuecomment-500574800",
"url": "https://github.com/openstreetmap/openstreetmap-website/pull/2204?email_source=notifications\u0026email_token=AAK2OLKOPQMD2X4V7UYXQJDPZ2YCLA5CNFSM4HE2LHC2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODXLCUUA#issuecomment-500574800",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>