some conflict removed