will stash conflict?
stash will conflict