update divs
fixed conflicts