编码格式规范化
conclud merge