resolve merge conflict

notebooks/compile_results_paper_all_types.ipynb

src/experiments/reproduce_experiments.py

src/experiments/run_experiment.py

src/methods/PBAD.py

src/utils/pattern_mining.py

src/utils/pattern_mining_spmf.py