resizing
fixed conflicts