Populating unordered_map in read_zca_probes()
fixed merge conflicts