fixes #87
Merge pull request #88 from twitter/issue_87_merge_not_overwrite_twttr

fixes #87