another method resolving whether fish run across
Merge remote-tracking branch 'origin/master'