add staging address for ssh
fix conflicts