diff --git a/hyphenopoly.module.js b/hyphenopoly.module.js
index 0e55b280..e18899fc 100644
--- a/hyphenopoly.module.js
+++ b/hyphenopoly.module.js
@@ -2,7 +2,6 @@
  * @license Hyphenopoly.module.js 2.3.0 - hyphenation for node
  *  ©2018  Mathias Nater, Zürich (mathiasnater at gmail dot com)
  *  https://github.com/mnater/Hyphenopoly
->>>>>>> master
  *
  * Released under the MIT license
  * http://mnater.github.io/Hyphenopoly/LICENSE