resolve merge conflict in layout.jade