A development team wants to work on new features in isolation from the main application rulesets, then eventually combine that work into the target rulesets. During this branch-based development effort, which activity is used to combine the branch work back into the target rulesets and may surface issues that must be handled before completion?