Update CREXDetectorConstruction.cc

Resolving conflicts