Create file 'file4'
Merge branch 'branch2'