diff --git a/dwds/lib/src/injected/client.js b/dwds/lib/src/injected/client.js
index 4019a15a4..3ca7337b4 100644
--- a/dwds/lib/src/injected/client.js
+++ b/dwds/lib/src/injected/client.js
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 // Generated by dart2js (fast startup emitter, strong), the Dart to JavaScript compiler version: 2.13.0-203.0.dev.
-=======
-// Generated by dart2js (fast startup emitter, strong), the Dart to JavaScript compiler version: 2.13.0-165.0.dev.
->>>>>>> master
 // The code supports the following hooks:
 // dartPrint(message):
 //    if this function is defined it is called instead of the Dart [print]