Fixed SFTP merge snafu