In 2 Samuel 21 it is a warrior named Elhanan who defeats Goliath. This story is more familiar to us in 1 Samuel 17, where David is Goliath’s opponent. This is an example of a story that “floats” in oral tradition from a lesser hero to a greater hero.