conflict cancellation

Change-Id: I5d25508f933dfdeecc23911e682416eb086d8496