Files would be overwritten by merge

git add * 
git stash
git pull