added e
added f
added g
Merge branch 'newBranch2'