Fixed more merge problems.