add database connection
fix conflict