new file for merging into master
new line before merge
contents to be merged into master from feature1
contents to be merged into master from feature1