I feel like they need to bring Dinah Lance back, simply because otherwise she's a hugely dangling storyline, and it's cruel to imply that the mother who searched and searched for her daughter wasn't told she was alive... but there is no way that they can merge in the comics canon of Black Canary's mother, with what they've show us thus far.