I have latest changes in release branch of git. I want to merge it into master branch. There are conflicts. I want to keep all the changes of release branch in the merge. How do I avoid resolving each conflict?