add some lines on func1
update func1
Merge branch 'func1'