fix uninstall
fix merge