fixed git conflict header.tpl