Adds missing stash pop to git-merge-master