diff --git a/tests/_benderjs/ckeditor/static/tools.js b/tests/_benderjs/ckeditor/static/tools.js
index 1be1ced856a..daf9d66cb52 100644
--- a/tests/_benderjs/ckeditor/static/tools.js
+++ b/tests/_benderjs/ckeditor/static/tools.js
@@ -1181,7 +1181,6 @@
 		},
 
 		/**
-<<<<<<< HEAD
 		 * Creates a promise from the given function. It works in a similar way as a promise constructor
 		 * (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise),
 		 * with support for IE8 browser.