Folding in PR merges