Removed secrets from gitignore (after sanitising secrets.yml, naturally)
Adding sanitised secrets.yml
Fixed merge conflict