more style and template updates… brace for merge conflict
Fixed merge conflicts