Add ridescout to sponsors
Fix merge conflict