Simplify merging while making sure we dont effect existing objects
Merge pull request #18 from groupon/ab/merge-failure

Simplify merging while making sure we dont effect existing objects