When merging into master the release branch is always preferred, so let t

When merging into master the release branch is always preferred, so let the merge know and prevent conflicts.
Using the recursive/theirs strategy the release is always preferred.