Corrected some merge errors with header.ftl