I should probably just write a little tool to do the merging