database.yml
removed conflicts