Fixed reference variable error

compact/ffi_ZDC_HCAL.xml

@@ -120,7 +120,7 @@
       </layer>
     </detector>
     <detector id="2" name="largeZDC" type="ZDC" readout="ZDCHits" vis="RedVis">
-      <position x="ffi_ZDC_HCAL_lt_ZDC_x_pos" y="ffi_ZDC_HCAL_lt_y_pos" z="ffi_ZDC_HCAL_lt_z_pos"/>
+      <position x="ffi_ZDC_HCAL_lt_x_pos" y="ffi_ZDC_HCAL_lt_y_pos" z="ffi_ZDC_HCAL_lt_z_pos"/>
       <dimensions x = "ffi_ZDC_HCAL_lt_length" y = "ffi_ZDC_HCAL_lt_length"/>
       <layer repeat="2">
         <slice name="Tungsten_slice" material="TungstenDens24" thickness="7*mm" vis = "GrayVis"/>
@@ -168,11 +168,7 @@
 
   <!--  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>