Fixing more merge issues.