database config with ec2
fixed merge conflicts