Solve merge conflict on layout.jade, with much rejoicing