fixed conflict in README

Author: dbarneche

README.Rmd

@@ -46,7 +46,7 @@ Focused on the protection and preservation of the iconic Great Barrier Reef, it
 
 The `ereefs` R package provides easy access to
 [eReefs](https://www.ereefs.org.au/about/) and other
-[CSIRO-EMS](https://research.csiro.au/cem/software/ems/) output files. **`ereefs` focuses on accessing eReefs data model in its original format, including eReefs data from the National Computational Infrastructure (NCI) [eReefs data services](https://dapds00.nci.org.au/thredds/catalog/fx3/gbr4_v2/catalog.html), not the gridded AIMS eReefs model data provided via the [eReefs data service](https://hyrax.ereefs.aims.gov.au/).** It can also be used to explore and visualise other CSIRO-EMS model output data, including output from RECOM model runs. CSIRO-EMS is the hydrodynamic-biogeochemical modelling software that underpins the eReefs models for the Great Barrier Reef. RECOM is an online interface that helps registered users to set up higher-resolution instances of CSIRO-EMS for small areas such as individual reefs that are nested within the eReefs models.
+[CSIRO-EMS](https://research.csiro.au/cem/software/ems/) output files. **`ereefs` focuses on accessing eReefs data model in its original format, including eReefs data from the National Computational Infrastructure (NCI) [eReefs data services](https://dapds00.nci.org.au/thredds/catalog/fx3/gbr4_v2/catalog.html), not the gridded AIMS eReefs model data provided via the [eReefs data service](https://thredds.ereefs.aims.gov.au/).** It can also be used to explore and visualise other CSIRO-EMS model output data, including output from RECOM model runs. CSIRO-EMS is the hydrodynamic-biogeochemical modelling software that underpins the eReefs models for the Great Barrier Reef. RECOM is an online interface that helps registered users to set up higher-resolution instances of CSIRO-EMS for small areas such as individual reefs that are nested within the eReefs models.
 
 `ereefs` is designed to assist R users who need more customised access to eReefs data. This includes things like:
 

README.md

@@ -53,8 +53,8 @@ The `ereefs` R package provides easy access to
 format, including eReefs data from the National Computational
 Infrastructure (NCI) [eReefs data
 services](https://dapds00.nci.org.au/thredds/catalog/fx3/gbr4_v2/catalog.html),
-not the gridded AIMS eReefs model data provided via the [eReefs data
-service](https://hyrax.ereefs.aims.gov.au/).** It can also be used to
+not the gridded AIMS eReefs model data [eReefs data
+service](https://thredds.ereefs.aims.gov.au/).** It can also be used to
 explore and visualise other CSIRO-EMS model output data, including
 output from RECOM model runs. CSIRO-EMS is the
 hydrodynamic-biogeochemical modelling software that underpins the eReefs

vignettes/about.Rmd

@@ -36,7 +36,7 @@ These tools and information are hosted on multiple websites. For example, while
 
 - The Bureau of Meteorology provides the [ReefTemp NextGen](http://www.bom.gov.au/environment/activities/reeftemp/reeftemp.shtml)---a set of high resolution mapping products that provide information on coral bleaching risk for the Great Barrier Reef region;
 
-- The Australian Institute of Marine Science (AIMS) also provides a [Visualisation Portal](https://ereefs.aims.gov.au/ereefs-aims), and maintains this [R package](https://github.com/open-aims/ereefs/). In addition, the AIMS [eReefs data service](https://hyrax.ereefs.aims.gov.au/) contains the aggregated data services (daily, monthly, annual for hydrology model, monthly and annual for biogeochemistry) on a regular grid. **Importantly, our R package focuses on accessing the data from NCI, not the AIMS eReefs data service.**
+- The Australian Institute of Marine Science (AIMS) also provides a [Visualisation Portal](https://ereefs.aims.gov.au/ereefs-aims), and maintains this [R package](https://github.com/open-aims/ereefs/). In addition, the AIMS [eReefs data service](https://thredds.ereefs.aims.gov.au/) contains the aggregated data services (daily, monthly, annual for hydrology model, monthly and annual for biogeochemistry) on a regular grid. **Importantly, our R package focuses on accessing the data from NCI, not the AIMS eReefs data service.**
 
 ## When is this R package not as useful?