Fixing conflict on 04-r.Rmd. Pdf and html not ready yet
Compiling the fix of the conflict