fix database.yml after merge