fix merge conflicts

Change-Id: I255bb1b8980c0b2c16d9952b66f950c275bbe11d