You can make a new commit after running `git checkout master -- config/database.yml`. We will ignore this file later so it doesn't pose a problem again.