fixed conflicts update css