checking mersging conflicts on slave
Merge branch 'slave'

Conflicts:
	file.java