fix header.html merge