styles
fixed conflicts