adjust some argument format after merge