added partial
fixed conflicts