add coding: utf-8
merge & fix file1.txt