Added database credentials
Merging