merge

merging styles