resolve merge conflict

“helper” functions were moved from `addPackages.R` to
`github-functions.R`