Issue #16: merge-parser: Correct data structure to handle addresses

Left to do is handling of hits.