Actually open db in Topic Activity
Resolving conflicts (hopefully)