created a scrollable code block with syntax highlighting
fixing merge conflicts