merging migrations resulting from parallel branches