Help!! In this same cactus, purple flowers are dominant to yellow flowers. A cactus that has both...?

... two-pronged and one-pronged spines has yellow flowers. It is crossed with a two-pronged cactus with purple flowers (heterozygous). What are the phenotypes of the offspring and in what proportion?