Remove conflicts conditional