one more merge failure fix.