More merge issues fixed.