Merging master again...

I need a way to do this conveniently... Manual merging can take a while...
even with diff tools...