diff --git a/NPLib/Exogam/TExogamPhysics.cxx b/NPLib/Exogam/TExogamPhysics.cxx
index 2f7b30e9de71cc12da2864f0f690439f261173cd..809796beacc0a1b02f16fc26564a445d2bfdc055 100644
--- a/NPLib/Exogam/TExogamPhysics.cxx
+++ b/NPLib/Exogam/TExogamPhysics.cxx
@@ -556,23 +556,15 @@ void TExogamPhysics::ClearSpectra(){
   // To be done
 }
 ///////////////////////////////////////////////////////////////////////////
-<<<<<<< HEAD
-map< vector<TString> , TH1*> TExogamPhysics::GetSpectra() {
-  if(m_Spectra)
-    return m_Spectra->GetMapHisto();
-  else{
-    map< vector<TString> , TH1*> empty;
-=======
 map< vector<string> , TH1*> TExogamPhysics::GetSpectra() {
   if(m_Spectra)
     return m_Spectra->GetMapHisto();
   else{
     map< vector<string> , TH1*> empty;
->>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
     return empty;
   }
 } 
-
+//////////////////////////////////////////////////////////////////////////
 void TExogamPhysics::AddClover(string AngleFile)
 {
   ifstream file;
diff --git a/NPLib/Exogam/TExogamSpectra.cxx b/NPLib/Exogam/TExogamSpectra.cxx
index 954dde526046c9314bfdd36f0e437b52194667d2..62005a919ad6c31fe93ee65cf2067086a039b991 100644
--- a/NPLib/Exogam/TExogamSpectra.cxx
+++ b/NPLib/Exogam/TExogamSpectra.cxx
@@ -131,52 +131,29 @@ void TExogamSpectra::InitPhysicsSpectra(){
 
 ////////////////////////////////////////////////////////////////////////////////
 void TExogamSpectra::FillRawSpectra(TExogamData* RawData){
-<<<<<<< HEAD
-  TString name;
-  TString family;
-  // Energy and Time RAw 
-=======
   string name;
   string family;
 
   // Energy 
->>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
-  for (unsigned int i = 0; i < RawData->GetECCEMult(); i++) {
-
+  for (unsigned int i = 0; i < RawData->GetECCEMult(); i++){
     name = Form("ExogamEnergyRaw_Clover%d_ECC%d", RawData->GetECCEClover(i)+1,RawData->GetECCECristal(i)+1);
     family = "Exogam/ERAW/ECC";
     GetHisto(family,name)
       -> Fill(RawData->GetECCEEnergy(i));
-<<<<<<< HEAD
    }
 
-  for (unsigned int i = 0; i < RawData->GetGOCCEEMult(); i++) {
+  for (unsigned int i = 0; i < RawData->GetGOCCEEMult(); i++){
     name = Form("ExogamEnergyRaw_Clover%d_ECC%d_GOCCE%d", RawData->GetGOCCEEClover(i)+1,RawData->GetGOCCEECristal(i)+1,RawData->GetGOCCEESegment(i)+1);
     family = "Exogam/ERAW/GOCCE";
-=======
-   
-    name = Form("ExogamEnergyRaw_Clover%d_ECC%d_GOCCE%d", RawData->GetECCEClover(i)+1,RawData->GetECCECristal(i)+1,RawData->GetGOCCEESegment(i)+1);
-    family = "Exogam/RAW";
->>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
-
-    GetHisto(family,name)
+    
+  GetHisto(family,name)
       -> Fill(RawData->GetGOCCEEEnergy(i));
     }
 
-<<<<<<< HEAD
-  for (unsigned int i = 0; i < RawData->GetECCTMult(); i++) {
-    name = Form("ExogamTimeRaw_Clover%d_ECC%d", RawData->GetECCTClover(i)+1,RawData->GetECCTCristal(i)+1);
-    family = "Exogam/TRAW/ECC";
-
-    GetHisto(family,name)
-      -> Fill(RawData->GetECCTTime(i));
-   }
-=======
   // Time
-  for (unsigned int i = 0; i < RawData->GetECCTMult(); i++) {
+  for (unsigned int i = 0; i < RawData->GetECCTMult(); i++){
    name = Form("ExogamTimeRaw_Clover%d_ECC%d", RawData->GetECCTClover(i)+1,RawData->GetECCTCristal(i)+1);
     family = "Exogam/RAW";
->>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
 
     GetHisto(family,name)
       -> Fill(RawData->GetECCTTime(i));
@@ -185,15 +162,9 @@ void TExogamSpectra::FillRawSpectra(TExogamData* RawData){
 
 ////////////////////////////////////////////////////////////////////////////////
 void TExogamSpectra::FillPreTreatedSpectra(TExogamData* PreTreatedData){
-<<<<<<< HEAD
-  TString name ;
-  TString family;
-  // Energy and Time Cal
-=======
   string name ;
   string family;
   // Energy 
->>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
   for (unsigned int i = 0; i < PreTreatedData->GetECCEMult(); i++) {
     name = Form("ExogamEnergyCal_Clover%d_ECC%d", PreTreatedData->GetECCEClover(i)+1,PreTreatedData->GetECCECristal(i)+1);
     family = "Exogam/ECal/ECC";
@@ -210,7 +181,6 @@ void TExogamSpectra::FillPreTreatedSpectra(TExogamData* PreTreatedData){
       -> Fill(PreTreatedData->GetGOCCEEEnergy(i));
     }
 
-<<<<<<< HEAD
   for (unsigned int i = 0; i < PreTreatedData->GetECCTMult(); i++) {
     name = Form("ExogamTimeCal_Clover%d_ECC%d", PreTreatedData->GetECCTClover(i)+1,PreTreatedData->GetECCTCristal(i)+1);
     family = "Exogam/TCal/ECC";
@@ -219,25 +189,7 @@ void TExogamSpectra::FillPreTreatedSpectra(TExogamData* PreTreatedData){
       -> Fill(PreTreatedData->GetECCTTime(i));
 
   }
-=======
    
-    name = Form("ExogamEnergyCal_Clover%d_ECC%d_GOCCE%d", PreTreatedData->GetECCEClover(i)+1,PreTreatedData->GetECCECristal(i)+1,PreTreatedData->GetGOCCEESegment(i)+1);
-    family = "Exogam/Cal";
-
-    GetHisto(family,name)
-      -> Fill(PreTreatedData->GetGOCCEEEnergy(i));
-    }
-
-  // Time
-  for (unsigned int i = 0; i < PreTreatedData->GetECCTMult(); i++) {
-  name = Form("ExogamTimeCal_Clover%d_ECC%d", PreTreatedData->GetECCTClover(i)+1,PreTreatedData->GetECCTCristal(i)+1);
-    family = "Exogam/Cal";
-
-    GetHisto(family,name)
-      -> Fill(PreTreatedData->GetECCTTime(i));
-   }
->>>>>>> a51372fab418d17126a214991f612e6da2c5c9be
-
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/NPLib/Misc/TTacPhysics.cxx b/NPLib/Misc/TTacPhysics.cxx
index 251cf6e332730921be1510b8b824c463ac39434f..c01d8afae82c221767e29bbc80aa52a43e9c4c74 100644
--- a/NPLib/Misc/TTacPhysics.cxx
+++ b/NPLib/Misc/TTacPhysics.cxx
@@ -125,10 +125,10 @@ void TTacPhysics::BuildSimplePhysicalEvent()
 	{
 	   	TacNumber.push_back(EventData->GetTAC_MM_HF_DetectorNbr(i));
 	}
-		Time_TAC_1=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(0) ),EventData->GetTAC_MM1_HF() );
-		Time_TAC_2=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(1) ),EventData->GetTAC_MM2_HF() );
-		Time_TAC_3=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(2) ),EventData->GetTAC_MM3_HF() );
-		Time_TAC_4=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(3) ),EventData->GetTAC_MM4_HF() );
+		Time_TAC_1=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(0) ),EventData->GetTAC_MM_HF() );
+		Time_TAC_2=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(1) ),EventData->GetTAC_MM_HF() );
+		Time_TAC_3=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(2) ),EventData->GetTAC_MM_HF() );
+		Time_TAC_4=CalibrationManager::getInstance()->ApplyCalibration("TAC/_T" + itoa( EventData->GetTAC_MM_HF_DetectorNbr(3) ),EventData->GetTAC_MM_HF() );
 		
    }
 
diff --git a/NPLib/Physics/NPReaction.cxx b/NPLib/Physics/NPReaction.cxx
index b25a373b60fbc8391396e10fbfad6f1d37ecb0eb..7f97365a6768af06ebe6b8ffc99a6573e8fb0d47 100644
--- a/NPLib/Physics/NPReaction.cxx
+++ b/NPLib/Physics/NPReaction.cxx
@@ -176,11 +176,11 @@ Reaction::~Reaction(){
   if(fNuclei4)
     delete fNuclei4;
   
-  if(fCrossSectionHist)
-    delete fCrossSectionHist;
+//  if(fCrossSectionHist)
+//    delete fCrossSectionHist;
 
-  if(fExcitationEnergyHist)
-    delete fExcitationEnergyHist;
+//  if(fExcitationEnergyHist)
+//    delete fExcitationEnergyHist;
 }
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......