fixed merges in sms controller