It looks like I've succeeded in merging one of my features back to the main line. We'll see how it goes.
