remove conflicts

Change-Id: Iddc17b2aa2503684ebb57e089113c296a95f96a9