I'd like to see both in the Olympics.
I'd also like to see baseball and softball added back in, though, too.
It seems silly to me that sports that are four categories for cycling (BMX, road, track, and mountain bike), but sports like baseball, rugby, karate, softball, and golf aren't.