Merge FTP
Merge origin/master
Merge FTP