Solve merge pending

Change-Id: I249f3d76274536dee3fc83d48a993e86b902d056