latest styles
fixed conflicts