diff --git a/speech_analysis.m b/speech_analysis.m
index dfed670..b6eff76 100644
--- a/speech_analysis.m
+++ b/speech_analysis.m
@@ -3,7 +3,6 @@ pkg load signal
 audiowrite('outmodulator22.wav',y,fs/2);
 n = length(y); 
 t=0:1/fs:(n-1)/fs; % time range
-<<<<<<< HEAD
 figure;
 plot(t,y);
 xlabel('time (s)');
@@ -13,7 +12,7 @@ ylabel('amplitude');
 [power,duration]=frequencySpectrum(y, fs, false);
 figure;
 plot(duration,power);
-=======
+
 i=1;
 ldft=[];
 while (i<6)