New File
Merge branch 'master' into branch2
merge
Merge
Resolved conflict