Finished merge
DB connection on deviceready