conflicts reslovement

Change-Id: I481476648d9f4893215729309073ab5a6a195809