Keep fixing untrack database.yml issue
fixes merge conflicts