diff --git a/regression_test/XML/Issue545/Issue545b.ttcn b/regression_test/XML/Issue545/Issue545b.ttcn
index 1ec94de34d6c4bef4a34a7c76442567e108b697e..3b871e6bec8cadb04767351bd925ebfc27410495 100644
--- a/regression_test/XML/Issue545/Issue545b.ttcn
+++ b/regression_test/XML/Issue545/Issue545b.ttcn
@@ -11,8 +11,11 @@
  ******************************************************************************/
 module Issue545b {
 
+<<<<<<< HEAD
 // global namespace variants should no longer overwrite inherited namespace variants (issue #545)
 
+=======
+>>>>>>> 97652b443bcdc798cfe153813828986f87dc8f2d
 import from Issue545a all;
 
 type record T2 {