fix merge

Change-Id: I3cb684a708dd063c1a163985aad2e13aebfa93c0
fixes duplicates x,x

Change-Id: If0061bed1678ad37c2cd858874ff88677a14e5ed