diff --git a/macros/testShowGraphs.cxx b/macros/testShowGraphs.cxx
index 4a1ccdf1a0dc2f820887f54de02ee7157bf9a822..7ef6eb0b20675742ba9a0517788901c75b308310 100644
--- a/macros/testShowGraphs.cxx
+++ b/macros/testShowGraphs.cxx
@@ -7,11 +7,11 @@ void testShowGraphs()
 
 	TFile fr("../data/dataDSR4/analysis_08_2.root");
 //	TFile fr("../data/dataDSR4/analysis_07_8.root");
-<<<<<<< HEAD
-	TFile fr("../data/dataDSR4/Neurad_081216_2NEW.root");
-=======
+
+//	TFile fr("../data/dataDSR4/Neurad_081216_2NEW.root");
+
 //	TFile fr("../data/dataTektronix/exp18.root");
->>>>>>> 1612d04b19c3139e125a1642bdb0763585790d84
+
 //	TFile fr("../data/dataTektronix/analysisExp7.root");
 	TTree *tr = (TTree*)fr.Get("atree");
 
@@ -49,27 +49,27 @@ void testShowGraphs()
 //	cout << "warning 3" << endl;
 
 	TCanvas *c1 = new TCanvas("c1","test",10,10,1000,600);
-<<<<<<< HEAD
+
 	//c1->Divide(3,2);
-=======
+
 	c1->Divide(3,4);
->>>>>>> 1612d04b19c3139e125a1642bdb0763585790d84
+
 
 	TF1 *f1 = new TF1("f1name", "[0]+x*[1]");
 //	TF1 *f1 = new TF1("pol1", );
 
-<<<<<<< HEAD
-	/*for (Int_t k = 0; k < 6; k++) {
-=======
-	for (Int_t k = 0; k < 12; k++) {
->>>>>>> 1612d04b19c3139e125a1642bdb0763585790d84
+
+	for (Int_t k = 0; k < 6; k++) {
+
+//	for (Int_t k = 0; k < 12; k++) {
+
 		c1->cd(k+1);
 		gr[k]->Draw("AL*");
 
 		//cout << t10[k] << "\t" << t90[k] << endl;
 		//f1->SetRange(t10[k], t90[k]);
 		//gr[k]->Fit(f1, "RQ");
-	}*/
+	}
 
 //	c1->cd(2);
 //	tr->Draw("gAmp.Draw()","","goff",1,124);