<p>Could you please fix the merge conflicts in Gemfile.lock?</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br>Reply to this email directly or <a href='https://github.com/openstreetmap/openstreetmap-website/commit/80dba54d5cd66d9e903c882ec598ed28cfba2d87#commitcomment-2921210'>view it on GitHub</a>.<img src='https://github.com/notifications/beacon/uTRSc6ihLa7Shf84BpiOpkBeszaUMNewmZUMMoO7lztjPheylzMOgg0WMVVGlPiN.gif' height='1' width='1'></p>