add texting voicemail and fix merge conflicts
commit binary files
resolve DS_Store merge conflict