diff --git a/processing/wikiproc/tests/testthat/test-clean_html.R b/processing/wikiproc/tests/testthat/test-clean_html.R
index 084e9b3cb77c0b9eade4a114de4f985652e1572d..467230cbc0a48f4a9f1c2a0ed0f79df05e62c5a3 100644
--- a/processing/wikiproc/tests/testthat/test-clean_html.R
+++ b/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)
 })