diff --git a/compact/definitions.xml b/compact/definitions.xml
index e20fdaf38a239505cb0890cc986183920c2bc5cb..85baa506115b2c008e1a2a21da493d987539e64d 100644
--- a/compact/definitions.xml
+++ b/compact/definitions.xml
@@ -603,7 +603,7 @@
 
     <comment> Global parameters </comment>
     <constant name="ffi_ZDC_width"             value="60.0 * cm"/>
-    <constant name="ffi_ZDC_thickness"         value="200.0 * cm"/>
+    <constant name="ffi_ZDC_thickness"         value="65.0 * cm"/><comment> Changed from 200.0 cm </comment>
     <comment> Original Global parameters </comment>     
     <!--
     <constant name="ffi_ZDC_thickness"         value="250.0 * cm"/>
diff --git a/compact/ffi_ZDC_HCAL.xml b/compact/ffi_ZDC_HCAL.xml
index 6ac0f3c2b04b03d64b64ba55885cfb5183428173..fe303141a25db339b915af94e78bab8b8098fead 100644
--- a/compact/ffi_ZDC_HCAL.xml
+++ b/compact/ffi_ZDC_HCAL.xml
@@ -14,11 +14,6 @@
 
     <!-- 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 -->
diff --git a/src/ffi_ZDC_HCAL.cpp b/src/ffi_ZDC_HCAL.cpp
index 048d786fc30eb96c91d6c732152b335cc094d96a..9fa36e8feeb215712ff4658169f7534c01023d85 100644
--- a/src/ffi_ZDC_HCAL.cpp
+++ b/src/ffi_ZDC_HCAL.cpp
@@ -36,7 +36,7 @@ static Ref_t createDetector(Detector& lcdd, xml_h e, SensitiveDetector sens) {
 	int layer_num = 1;
 	int slice_num = 1;
 	double totWidth = Layering(x_det).totalThickness();
-	Box envelope (pixel_x/2.0, pixel_y/2.0,totWidth/2.0);
+	Box envelope ((pixel_x + 10.0*dd4hep::mm)/2.0, (pixel_y + 10.0*dd4hep::mm)/2.0,totWidth/2.0);
 	Volume envelopeVol(det_name+"_envelope",envelope,air); 
 	PlacedVolume pv;