diff --git a/vignettes/data_pre_processing.Rmd b/vignettes/data_pre_processing.Rmd
index f87d4a26..aea42692 100644
--- a/vignettes/data_pre_processing.Rmd
+++ b/vignettes/data_pre_processing.Rmd
@@ -18,12 +18,15 @@ For our purposes, we only use `random.cdisc.data::cadae` as example data because
 
 ```{r}
 library(random.cdisc.data)
+<<<<<<< HEAD
 data("cadae")
 ```
 
 ```{r}
 # desc_ae <- Hmisc::describe(cadae)
 # desc_ae$SEX
+=======
+>>>>>>> 43337d714f94ee0883510ac7966320adb1edeaec
 ```
 
 ## Reducing number of levels per variable