resolve merge conflict in layout.jade
add font