modify the music on branchtest2
git rm --cached music on master
readd the music fixed
fix the message on master
Merge branch 'master' into branchtest2
fix the masterbranch
git merge tool on master
merge 1
1111111
1111111branch4
branch4 merge to master(modify the commit message)
test