add coding : utf-8
conflict fixed