Fix ignoring fish files
Fix merge conflict