remove file2.txt
commit
addition 5
Merge branch 'test'