css
fixed conflicts