Change made in branch2
Change made in master
Change made in branch2.
Results of merge