清除衝突的標記
images from local.cht
Merge branch 'local.eng' into master.eng