v0.2.54..v0.2.55 changeset HighwayMatch.h

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMatch.h b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMatch.h
index 639beaf..bef8468 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMatch.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMatch.h
@@ -78,7 +78,9 @@ public:
   const std::shared_ptr<SublineStringMatcher>& getSublineMatcher() const
   { return _sublineMatcher; }
 
-  virtual bool isConflicting(const ConstMatchPtr& other, const ConstOsmMapPtr& map) const override;
+  virtual bool isConflicting(
+    const ConstMatchPtr& other, const ConstOsmMapPtr& map,
+    const QHash<QString, ConstMatchPtr>& matches = QHash<QString, ConstMatchPtr>()) const override;
 
   /**
    * Simply returns the two elements that were matched.