Merge

## What it means

Combining the changes from one branch into another, usually bringing finished work back into the main version.