Branch file
Master branch file
Merge branch 'branch1'