resolve conflict

examples/open_data_examples/GW150914.py

@@ -53,11 +53,7 @@ waveform_generator = tupak.WaveformGenerator(time_duration=interferometers[0].du
 
 # In this step, we define the likelihood. Here we use the standard likelihood
 # function, passing it the data and the waveform generator.
-<<<<<<< HEAD
-likelihood = tupak.likelihood.GravitationalWaveTransient(interferometers, waveform_generator, time_marginalization=False, distance_marginalization=True, prior=prior)
-=======
 likelihood = tupak.GravitationalWaveTransient(interferometers, waveform_generator)
->>>>>>> e8b704afba65886f49cb448402a95ae90c468a24
 
 # Finally, we run the sampler. This function takes the likelihood and prio
 # along with some options for how to do the sampling and how to save the data