merge with ziteng