Fixed more merge issues.