deleted <<<<<<< HEAD in tmpl25/default/template_css.php