fix install script
fix merge conflict