branching example
Merge branch 'beta' into alpha
added a file