fixing links to the blog post
resolving merge conflict