diff --git a/DESCRIPTION b/DESCRIPTION
index 6f76006..179a309 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -31,4 +31,4 @@ LazyData: true
 LazyDataCompression: xz
 NeedsCompilation: no
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
diff --git a/NEWS.md b/NEWS.md
index 9a6b723..6ae4462 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,12 +1,11 @@
-<<<<<<< HEAD
 # mlr3data (development version)
 
+* Readd `ames_housing` data set.
+
 # mlr3data 0.8.0
 
-* Move  `ames_housing` to mlr3.
+* Move `ames_housing` to mlr3.
 
-=======
->>>>>>> parent of 9b7e8c2 (refactor: move ames housing to mlr3 (#20))
 # mlr3data 0.7.0
 
 * Added dataset `ames_housing`, used in the book about mlr3.