Merging changes to database connection.
Merging conflicts in HomeActivity in customer app