I just started Act 3, and I went to Merill's house, and... she's acting as if I had already done her act 3 companion quest, crying over Marethari being dead. I haven't done anything with Merrill besides having her make a comment in Aveline's beginning-of-the-act check-in quest.
I withheld the tool thingy (whatever it's called) in Act 2, if that matters.
Sooo... is there a way to fix this?