sms: fix profile merge conflict
Merge branch 'master' of https://github.com/TedStudley/Cereal-Hack-3