I dont understand this

processing/wikiproc/tests/testthat/test-clean_html.R

@@ -4,13 +4,9 @@ test_that("html cleansing works", {
   filename_raw <- "article-4-raw.html"
   filename_cleansed <- "article-4-cleansed.txt"
   html <- readChar(filename_raw, file.info(filename_raw)$size)
-<<<<<<< HEAD
+
   expected <- gsub("\\s", "", readChar(filename_cleansed, file.info(filename_cleansed)$size))
   actual <- gsub("\\s", "", clean_html(html))
-=======
-  expected <- readChar(filename_cleansed, file.info(filename_cleansed)$size)
-  actual <- clean_html(html)
->>>>>>> master
 
   expect_equal(expected, actual)
 })