Can you explain a bit what is in the master branch that should be "thrown out" and why (and conversely, what has been added to the branch that you think should be kept)? I'm looking at the revision history and it seems like the vast majority of commits are bug fixes that were applied to both branches.