Fix unresolved conflicts

Change-Id: I3553b9defd3115deea3c3c26069c41fe0e388790