Updated my ENV variables in application.yml
refactored twilio model methods
resolving merge conflict