stash conflict guide