error: The following untracked working tree files would be overwritten by merge: .idea/php.xml Please move or remove them before you merge. Aborting Updating e6b40b8..d6ede95 code example

Example: error: The following untracked working tree files would be overwritten by merge: static/platform_images/landing_page_img.png Please move or remove them before you merge. Aborting

git add * 
git stash
git pull