correction des conflits


Change-Id: I63b75bf2423032a322d98c255c35b3775a86f0c3
Signed-off-by: DrissGreen <driss.janid1@gmail.com>