Changes the return type of merge
bug noticed in PromiseLink
Add tests for the PromiseLink
Merge pull request #163 from twitter/merge-fix

Changes the return type of merge