simple resolution in master

Change-Id: I74586b9b2fdba6b16cb9a99ef2a399ccdf44664c
Signed-off-by: aaswan <aaswan@aaswan-PC>