3.txt modified
modifield 3.txt
modified 4.txt
merge two branch
fix the confilct