The following untracked working tree files would be overwritten by merge

git add * 
git stash
git pull