Adds ssh to root and setup-lift.sh.
Fixes merge conflicts.