git pull does not overwrite any changed files by default. If you want to overwrite - and loose - any changes, use git reset --hard origin/master.