Selling a t-shirt with a parody logo of a company isn't the same as a company presenting itself with a parody logo of an another company in the same space.
"The court ordered mediation in the case, and on April 1, 2010, the parties reached a closed settlement agreement."