Canadian Pacific Revises Merger Offer; Norfolk Southern Rejects It Again