devel/gh: Resolve conflict with shells/fish
PR: 255384 Reported by: Bjorn Neergaard <bjorn@neersighted.com> MFH: 2021Q2