connection to the database // database is local
Merge origin/master