fix a git merge issue in a blog post