Catalog of Life shows both as provisionally accepted names. So, currently, both plants exist separate of each other. As far as which one you actually have, I am unsure. Perhaps one of our sleuths in the plant id forum can help shed some light on the subject.
