fixed charset issue
conflict