merge with local.cht
merge from local.cht