Git marging to branch and back to master

I worked on a major refactoring of a big project. This refactoring was done on a dedicated branch, and is now finished. During that time development on master continued. Now I'd like to merge all the fresh changes into branch, apply the refactoring to new code as well, test everything and push back to master.I worked on a major refactoring of a big projec