processing response
fixed merge conflicts