Updated sftp setup
Merge conflict