adjust css
merge