Merge header.tpl with 1.5.5.1