changed styles structure
merged stules
merge 2