fix conflicts

Change-Id: Ic35785ecb5e0cb04ec956936d860da3c04cbfb94