One more merge mess-up.

--CAR