Fix marginalised likelihood

I found a bug in the marginalisation if both distance and phase were being used simultaneously. I've checked this works for all combinations of different marginalisations or lack thereof.

enabled an automatic merge when the pipeline for 10023a16 succeeds

merged

mentioned in commit 778d34fe