commit in test1
commit in test2
Merge branch 'test1' into test2

Conflicts:
	demo/src/main/java/foo/App.java
Merge branch 'test2'