Merge proposals

r-cran-conflicted in Ubuntu has no merge proposals.