updates to install
merge conflict.