fix merge bug

Change-Id: I0e9ef600dea99d05a2de3c6d6371510f071f4734