clear conflicts

Change-Id: I624ead102369f05e937ab968ac862c054030535c