ji
hi
Merge branch 'slave2'

Conflicts:
	file1.c
a2 commit