Oklahoma merges Columbus Day with Native American Day