updated documentation
fixed conflicts