A developer creates a new branch in a version control system to work on a new feature. After completing the feature, the developer wants to combine the changes from the feature branch back into the main branch. What is this process called?