Fixing stash conflicts