merge conflict 3col.tpl