Merging text from branch1 to master