add newf
new new
added a dir and file
another dir
Merge branch 'nBranch2' into newBranch