diff --git a/dataClasses/RawEvent.cpp b/dataClasses/RawEvent.cpp
index 945124f7c9aa90feb9e82cc7dc1e9ff9d59ac8f4..1f074bcaaba72337c423de01e17877c90240e69d 100644
--- a/dataClasses/RawEvent.cpp
+++ b/dataClasses/RawEvent.cpp
@@ -65,11 +65,19 @@ void RawEvent::SetTime(Double_t t, Int_t i) {
 	return;
 }
 
+<<<<<<< HEAD
 Double_t RawEvent::GetTime(Int_t i) {
 		return fTime[i];
 }
 
 Double_t RawEvent::GetAmp(Int_t i) {
+=======
+double RawEvent::GetOneTime(Int_t i) {
+		return fTime[i];
+}
+
+double RawEvent::GetOneAmp(Int_t i) {
+>>>>>>> ce93b2dc225df6ecb0ac76ba2c574a46d0ebe83e
 		return fAmp[i];
 }
 //void RawEvent::SetGraphs() {
diff --git a/dataClasses/RawEvent.h b/dataClasses/RawEvent.h
index eb248628bdb2345ff4987447ec2c36c0ef360cc9..56ea129e6921e89271405c2c092640be45b1340b 100644
--- a/dataClasses/RawEvent.h
+++ b/dataClasses/RawEvent.h
@@ -62,9 +62,15 @@ public:
 
 	void PrintTime(Int_t i);
 
+<<<<<<< HEAD
 	Double_t GetTime(Int_t i);
 
 	Double_t GetAmp(Int_t i);
+=======
+	double GetOneTime(Int_t i);
+
+	double GetOneAmp(Int_t i);	
+>>>>>>> ce93b2dc225df6ecb0ac76ba2c574a46d0ebe83e
 
 //	void InvertAmp(Double_t a, Int_t i);
 	//Inverts the amplitudes i.e. makes from negative singals