resolve merge conflict correctly

8 jobs for target_changer_prob_list_MD in 131 minutes and 56 seconds