fix conflicts

Change-Id: I1ee67991a4d914f1543426845087d262cfe17a6c