edit file2.txt
Merge branch 'newbranch'

merge new branch