diff --git a/man/get_join_keys.Rd b/man/get_join_keys.Rd
index 709499e4a3..991c23e5fd 100644
--- a/man/get_join_keys.Rd
+++ b/man/get_join_keys.Rd
@@ -1,12 +1,21 @@
 % Generated by roxygen2: do not edit by hand
+<<<<<<<
 % Please edit documentation in R/ddl.R, R/tdata.R
 \name{get_join_keys.ddl}
 \alias{get_join_keys.ddl}
+=======
+% Please edit documentation in R/tdata.R
+\name{get_join_keys.tdata}
+>>>>>>>
 \alias{get_join_keys.tdata}
 \title{Extract \code{JoinKeys} from \code{tdata}}
 \usage{
+<<<<<<<
 \method{get_join_keys}{ddl}(data)
 
+=======
+
+>>>>>>>
 \method{get_join_keys}{tdata}(data)
 }
 \arguments{
diff --git a/vignettes/adding-support-for-reporting.Rmd b/vignettes/adding-support-for-reporting.Rmd
index 83ebbbb18c..b28fbd32f4 100644
--- a/vignettes/adding-support-for-reporting.Rmd
+++ b/vignettes/adding-support-for-reporting.Rmd
@@ -54,7 +54,7 @@ Using `teal`, you can launch this example module with the following:
 
 ```{r, eval = FALSE}
 app <- init(
-  data = teal_data(IRIS = IRIS, MTCARS = mtcars),
+  data = teal_data(IRIS = iris, MTCARS = mtcars),
   modules = teal_example_module()
 )