setting up overline styles pt2
conflict fixin's