Fixing many more merge problems.