fix merge conflict

Change-Id: I73c2df22d0fac20168ef62d6d812ae05d91015b8