But why is that a problem? If you're merging changes from two different sources, of course the merge is going to have two parents. What else do you expect?