update database.yml
added localhost host to database.yml
added schema
resolved merge conflict