update SoapUI test module
update
resolve conflicts