secret_token.rb manual fix of conflict