merged upstream ; updated fish alias