diff --git a/input/fsh/instances/practitioner/ArminAhrens.fsh b/input/fsh/instances/practitioner/ArminAhrens.fsh
index 0b9e9b2c..faf632f6 100644
--- a/input/fsh/instances/practitioner/ArminAhrens.fsh
+++ b/input/fsh/instances/practitioner/ArminAhrens.fsh
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-=======
-// moved to 6-histopath-ServiceRequest
->>>>>>> d8dd1068ca04fbf47ccb1302bd76728d94c0e925
 Instance: ArminAhrens
 InstanceOf: CHCorePractitioner
 Title: "Armin Ahrens"