Adam/merge conflicts

because there were merge conflicts between release and master, in order to add the hotfix's commits to master, I did the following:
1) merged release into master and resolved the merge conflicts locally
2) checked out a new branch (adam/merge-conflicts), that contained the release commits and my fixes to resolve merge conflicts.
3) submitted a new pull request from adam/merge-conflicts to master