diff --git a/web/serverconfig.sample.php b/web/serverconfig.sample.php
index b5baf75..8607994 100644
--- a/web/serverconfig.sample.php
+++ b/web/serverconfig.sample.php
@@ -36,7 +36,6 @@ define('YAAMP_SITE_NAME', 'YiiMP');
 define('YAAMP_ADMIN_EMAIL', 'yiimp@spam.la');
 define('YAAMP_ADMIN_IP', ''); // samples: "80.236.118.26,90.234.221.11" or "10.0.0.1/8"
 define('YAAMP_ADMIN_WEBCONSOLE', true);
-<<<<<<< HEAD
 define('YAAMP_NOTIFY_NEW_COINS', true);
 define('YAAMP_DEFAULT_ALGO', 'lbry');
 define('YAAMP_CREATE_NEW_COINS', false);