Fixing secret_token merge