Create test_6.txt
New file: test_7.txt
Merge branch 'branch_3'