diff --git a/tests/nomad/test_parsing.py b/tests/nomad/test_parsing.py
index 16708f371..d93e82673 100644
--- a/tests/nomad/test_parsing.py
+++ b/tests/nomad/test_parsing.py
@@ -1,8 +1,5 @@
 """This is a code that performs several tests on nexus tool"""
-<<<<<<< HEAD
-=======
 
->>>>>>> master
 #
 # Copyright The NOMAD Authors.
 #