transposed the output from Xcorr-spiketrains and fixed merge conflict in the corresponding run file