Added a confirmation line to the install script
Fixed merge error