removed database.yml
resolved conflicts