Fixing merging conflicts

compact/definitions.xml

@@ -263,6 +263,7 @@
     <constant name="ForwardRomanPotC_ID" value="157"/>
     <constant name="ForwardOffMTracker_ID"  value="159"/>
 
+
     <constant name="ffi_ZDC_ID"          value="160"/>
     <constant name="ffi_ZDC_HCAL_ID"  value="161"/>
 

compact/ffi_ZDC_HCAL.xml

@@ -14,8 +14,11 @@
 
     <!-- Use DD4hep elements and materials definitions -->
     <includes>
+<<<<<<< HEAD
         <gdmlFile  ref="elements.xml"/>
         <gdmlFile  ref="materials.xml"/>
+=======
+>>>>>>> 9ee3db9223b2155b54d5db56319ad967a8d6c7c0
     </includes>
 
     <!-- Define the dimensions of the world volume -->
@@ -165,7 +168,11 @@
 
   <!--  Definition of the readout segmentation/definition  -->
   <readouts>
+<<<<<<< HEAD
         <readout name="ZDCHits">
+=======
+    <readout name="ZDCHits">
+>>>>>>> 9ee3db9223b2155b54d5db56319ad967a8d6c7c0
     <segmentation type="CartesianGridXY" grid_size_x="1.0*mm" grid_size_y="1.0*mm" />
     <id>system:8,layer:12,slice:12,x:48:-8,y:-8</id>  
   </readout>

reference_detector.xml

@@ -129,6 +129,7 @@
   <include ref="eic/forward_ion_beamline.xml"/>
   <include ref="compact/hcal.xml"/>
   <include ref="compact/forward_rich.xml"/>
+
   <!--
   <include ref="compact/ffi_ZDC_HCAL.xml"/>
   -->