Shorten sudo message
Update dropbox conflict helper to suggest newest