file2
method1
method2
Merge branch 'method1'

Conflicts:
	file2