Fixed minor problem in code snippet
Fixed minor formatting of code snippets
resolve merge conflict
Merge pull request #2136 from MonicaRush/MyMerge

My merge