resolve merge confilicts

Change-Id: I8a4b9aaff628256d4d3ffe59f9b2493bc0a1d47a