resolved conflict to theme.php " -a