diff --git a/code/plot_eodform_spikehist.py b/code/plot_eodform_spikehist.py
index 166fc3c..fcea2b0 100644
--- a/code/plot_eodform_spikehist.py
+++ b/code/plot_eodform_spikehist.py
@@ -14,8 +14,6 @@ dataset = '2018-11-14-al-invivo-1'
 # read eod and time of baseline
 time, eod = read_baseline_eod(os.path.join(data_dir, dataset))
 
-
-
 # read spikes during baseline activity
 spikes = read_baseline_spikes(os.path.join(data_dir, dataset))
 # calculate interpike intervals and plot them
@@ -31,14 +29,11 @@ ax.spines["top"].set_visible(False)
 ax.spines["right"].set_visible(False)
 fig.tight_layout()
 plt.show()
-#plt.show()
-<<<<<<< HEAD
+plt.show()
 #plt.savefig('isis.pdf')
 exit()
-=======
 plt.savefig('isis.png')
 
->>>>>>> b9573c65638c8a716e57d75fbe550f0a1ef8859f
 
 # calculate coefficient of variation
 mu = np.mean(interspikeintervals)