I agree with calendula identification. There are different varieties and that looks like a nice color combination. The flower is edible but I never eat mine. You might deadhead to encourage more blooms but calendulas readily self sow for me here in NH. This spring I transplanted some to other parts of the vegetable garden and pulled out some. So if you want some next year, let it go to seed at the end of the season.

a short lived perennial/biennial .. in my MI ... and the more foo foo.. the shorter lived ... maybe its a zone thing ... cant beat the standard Popsicle purple.. and red species back with a stick though ... lol ... they reseed themselves in a pleasant manner ... ken

Rose

Ozothamnus diosmifolius. Civilians call it "Rice Flower"