Is there a rivalry between Sega and Nintendo?

From 1989 to 1996, SEGA and Nintendo were at each others throats. After SEGA left the hardware business in 1999-2000 holiday season, Nintendo agreed to let them help the design games. They recently released a couple games for the PC.