lazy size
fixed conflicts