modifu=ying from banch1
another change from branch1
Merge branch 'branch1'
from branch1
from branch2
conflicts fixed