new file("Testing")
testing2 added
test2
Merge branch 'testing'