merge
merge 2
modify ttt.txt master2
modify wj master2