Update G4MC.cc

Resolving conflicts