Fixed up more merge issues.