add merge & testPwd