merge

Use when the user asks to merge another branch into the current branch, pull upstream changes without rebasing, or resolve merge conflicts.