Fixing some more merge madness.