Merge the latest pull and stash.