Uses multimerge
Merge pull request #399 from twitter/feature/useMultiMerge

Uses multimerge