merge
fixed select_thirdparty_list call in the select_company function