modification login
	-debbug ok
resolution conflit