3rd line
Merge branch 'slave_LP' into slave_AB

Conflicts:
	corporate.php