check done.听不清的已写入unresolved.txt文件中
resolve merge conflicts