Jekyll settings/html5/liquid hl
Merge conflict