v0.2.54..v0.2.55 changeset HighwayMergerCreator.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.cpp
index 1dba24f..d63f4d8 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.cpp
@@ -108,7 +108,7 @@ vector<CreatorDescription> HighwayMergerCreator::getAllCreators() const
 }
 
 bool HighwayMergerCreator::isConflicting(const ConstOsmMapPtr& map, ConstMatchPtr m1,
-  ConstMatchPtr m2) const
+  ConstMatchPtr m2, const QHash<QString, ConstMatchPtr>& /*matches*/) const
 {
   const HighwayMatch* hm1 = dynamic_cast<const HighwayMatch*>(m1.get());
   const HighwayMatch* hm2 = dynamic_cast<const HighwayMatch*>(m2.get());