jenkins merging release branch into master (strategy: theirs)