git 衝突問題 You are in the middle of a conflicted merge

解決方式

git reset --hard HEAD
git fetch origin
git reset --hard origin