Sean Wei
says to
YSITD
找到衝突的檔案，改好後 git merge