cleaned up merge text

Author: kirstenfrank

getclean.md

@@ -8,10 +8,6 @@ permalink: /getclean/
 - [Apples to Oranges Data Organisation Challenge](https://github.com/thoughtfulbloke/faoexample)
 - [dplyr Video Tutorial](https://www.youtube.com/watch?v=jWjqLW-u3hc) and [R Markdown document](http://rpubs.com/justmarkham/dplyr-tutorial): An [update](http://blog.rstudio.org/2014/01/17/introducing-dplyr/) to the plyr package, useful for subsetting, sorting, summarizing, and merging data using a more intuitive syntax than plyr or base R.
 - [Downloading files general advice](http://rpubs.com/thoughtfulbloke/downloadtips)
-<<<<<<< HEAD
 - [Codebook sample](https://gist.github.com/kirstenfrank/218c36a1938055d0f4e4)
 - [Second Codebook sample](https://gist.github.com/kirstenfrank/699abe3e16fd1dc36e5d)
-=======
 - [Query string (and other fields-within-fields) unrolling](http://rpubs.com/schnee/32988)
-
->>>>>>> 89a253d761447641cb7a05338057d73a26a5959d