remove conflict HEAD

Change-Id: Ib6a108f2f0e00ae7c5e27ebe8ca93b8ab8068925