css
fixed type
fixed type
fixed conflicts