fix update issue;
fix merge issue
finish taiwan