resolve conflict
release some import