fix unload error.
fix merge.