Conflict removed