add method1 in branch method1
comment in method1
method2 added in branch master
Merge branch 'method1'