Add blog resovling git merge conflicts