resolved conflict in mcmc_transitions.py