add coding: utf-8
fix the conflicted problem