stash conflicts resolved