refactor h1 and h2 styles for global use
fix merge conflict