add coding:utf-8
merge & fix conflict
add #