changed rest documentation
fixed conflicts