changed doc strings
fixed conflicts