fix conflicts

Change-Id: I5facb7840e134019c4be02747666affdea847117