diff --git a/js/util/script_detection.js b/js/util/script_detection.js
index 5f4d1689241..2135c9c5b3b 100644
--- a/js/util/script_detection.js
+++ b/js/util/script_detection.js
@@ -1,6 +1,5 @@
 'use strict';
 
-<<<<<<< HEAD
 module.exports.allowsIdeographicBreaking = function(chars) {
     for (const char of chars) {
         if (!exports.charAllowsIdeographicBreaking(char.charCodeAt(0))) {