Merge conflicts were only in "if multiprocessing.cpu_count() > 10: # parallel solution" and so I solved them locally.