add conflict slides + R code format

Merge request reports

Loading