config/secrets.yml
secrets.yml added .gitignore (development branch)
removed secrets.yml
fixed merge conflict