I'm thinking now the best idea would be to re-branch and merge the individual revisions from my branch to the new one. I think it should work and would be better than doing a lot of manual merging. Thoughts? -Mitchell