fixed responsive
fixed conflicts