Fixed minor problem in code snippet
Fixed minor formatting of code snippets
resolve merge conflict