fixed merge issue with response['result'] not being set