change the test2.txt for C4
change the test2.txt for C10
change the test1.txt
rebase test commit 1
rebase test commit 2
rebase test commit 3
rebase test commit 4
merge in server branch