Add conflicts with stuff
Merge branch 'release/plugin-sftp/v0.1.7-alpha'