Could you run git rm --cached config/database.yml? I don't really want to merge this in