fixed conflict in readme

Merge branch 'master' of git.soton.ac.uk:SERG/mapping-with-r

# Conflicts:
#	README.md

README.md

@@ -2,7 +2,7 @@
 
 Simple (and not so simple) examples of mapping data with R
 
-You might also like https://git.soton.ac.uk/twr1m15/la_emissions_viz which drives https://rushby.shinyapps.io/LAemissions/
+You might also like [https://git.soton.ac.uk/twr1m15/la_emissions_viz](https://git.soton.ac.uk/twr1m15/la_emissions_viz) which drives [https://rushby.shinyapps.io/LAemissions/](https://rushby.shinyapps.io/LAemissions/)
 
 ## data
 
@@ -14,12 +14,18 @@ The following example data is provided in this repository:
 
 ## Examples
 
- * rMappingExample[rMappingExample.html]: A simple example of mapping using R. Examples use Local Authority (LA) and Middle-layer Super Output Area (MSOA) geographies for the Solent area and electricity consumption data (both provided in the `data` subfolder for re-use);
- * lsoaExample[lsoaExample.Rmd]: Examples of LSOA mapping of various datasets for the Solent area.
+### rMappingExample
 
-## ONS-open-geography
+A [simple example of mapping using R](rMappingExample.html). Examples use Local Authority (LA) and Middle-layer Super Output Area (MSOA) geography and electricity consumption data (provided in `data` subfolder).
+>>>>>>> ea68ce4312db5b512e91afdd55cf1d412be2193f
 
-An example and resources for using the [ONS Open Geography portal](https://geoportal.statistics.gov.uk) to download geographical data and create maps  using `Leaflet` package.
+### ONS-open-geography
+
+An [example and resources](lsoaExample.html) for using the [ONS Open Geography portal](https://geoportal.statistics.gov.uk) to download geographical data and create maps  using `Leaflet` package.
+
+### fun with cartograms
+
+What it says [on the tin](/cartograms/hex-cartograms.html)
 
 ## Resources