removed reef fish and habitat evenness
fixed merge conflicts