fixed conflicts added nested styles
fixed conflicts