tell user if there are conflicts after applying stash