Add pre/code to reply snippet
Merge branch 'kdmcclin-prettify_code'
Remove snippet#show merge confilcts