Fix merge conflict secrets.rb