manifest: fix Conflicts

Change-Id: Idc8b207d9714b95a10ad720f1ab8ec7a39d80555
manifest: use our display

Change-Id: Id2acf387d1613c005e48fbf67742d2100d7cae23