How to consolidate TurboTax accounts once married and filing jointly?

I got married in 2015. Both my husband & I have used TurboTax in years previous, so we both have accounts and tax history here. He has standard W2 stuff, while I use the Home & Business version because I run my own business and have 1099 income. We plan on filing jointly this year.

My question is two-fold:
1) Can we consolidate accounts without losing either of our filing histories on TurboTax? If so, how?
2) Whose account should we file under? I assume mine, since I still need the Home & Business version.