new templates/style
conflicts