To merge fresh master into current branch:

git switch master && git pull && git switch - && git merge master