Resolve stash conflicts