Merge conflict resolution into `rbups` main branch