Git stash pop merge conflict

If merge conflict occures during git stash pop, just run git mergetool, solve conflict(s) and do git stash drop stash@{0}. Don't f*ck the mind about interrupted pop, changes are applied, but stash item is not deleted.