fixed conflict in layout.jade