Unable to "git stash pop" due to conflict

The stash has already been applied to other files; it is only page/search.php that you have to merge manually. Afterwards just run git reset to unstage the changes and keep on hacking – or git add ... and commit.

Resolved with:

git stash show -p

After the git stash pop command, you then have to resolve the conflict by hand then do git stash drop manually as the man git-stash suggests.