stash conflict resolution