merge conflict

Merge branch 'main' of github.com:r-devel/r-devel.github.io

# Conflicts:
#	events/r-dev-days/index.md

Author: hturner