diff --git a/lib/vscode/extensions/github-authentication/src/githubServer.ts b/lib/vscode/extensions/github-authentication/src/githubServer.ts
index cc811770..4fdafe0c 100644
--- a/lib/vscode/extensions/github-authentication/src/githubServer.ts
+++ b/lib/vscode/extensions/github-authentication/src/githubServer.ts
@@ -14,12 +14,9 @@ import { ExperimentationTelemetry } from './experimentationService';
 const localize = nls.loadMessageBundle();
 
 export const NETWORK_ERROR = 'network error';
-<<<<<<< HEAD
+// NOTE@coder: use our own auth relay (the commented one is microsoft's, not ours)
 const AUTH_RELAY_SERVER = 'auth.code-server.dev';
-=======
-const AUTH_RELAY_SERVER = 'vscode-auth.github.com';
 // const AUTH_RELAY_STAGING_SERVER = 'client-auth-staging-14a768b.herokuapp.com';
->>>>>>> 58ce849223667f77dc0d6d7658870ca3f815e17f
 
 class UriEventHandler extends vscode.EventEmitter<vscode.Uri> implements vscode.UriHandler {
 	public handleUri(uri: vscode.Uri) {