Database connection established

Database connection
cleared conflicts