Fixed bad merges + FTP JS