add new file
Merge branch 'testing'
add new line in file three.txt
Merge branch 'testing'