idea 还原git merge

NoSuchKey