Ok I think it's fixed, I'll leave my comment in case anyone else gets confused, but I just had to go sleep in my bed, the next morning a cutscene happened and Merigold gave me a new quest.
