new editing
fixing conflicts of products-zh_cn.md