Fixed some more merge problems.