fixed lots of bugs in conflation and POI merging