Syntax highlighting

Adding syntax highlighting to code snippets
Fixing merge conflict