fixed resizing
fixed conflicts