Adding some padding to code blocks
Fixing merge issue