Fixing path issue
Fixing merge conflict

Conflicts:
	config/bootstrap.php