Read in Fish description from file
Resolving conflicts, adding fish thing