link with DB
username and db pass
fixed merge conflict