I’m working on a feature branch and a hotfix was recently merged into master. I want to bring that fix into my branch, but I’d prefer not to clutter the history with unrelated commits. What’s the cleanest way to git merge master into a branch, ensuring the hotfix is applied without introducing duplicate or unnecessary commits?