Registration Open for Bioc2024 July 24-26

Resolve merge conflicts

This page has moved to https://contributions.bioconductor.org/git-version-control.html#resolve-merge-conflicts