updated webservice_url
updated conflicts
updated issue in conflict