Update header.html
fixed merge