Fix clash

Change-Id: I9ff987871ce438714e7ff069951b4afd24260244