add another coding:utf-8
fix conflicts