v0.2.54..v0.2.55 changeset NetworkMergerCreator.h

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h
index 89488ff..c63af79 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef NETWORKMERGERCREATOR_H
 #define NETWORKMERGERCREATOR_H
@@ -48,7 +48,9 @@ public:
 
   virtual std::vector<CreatorDescription> getAllCreators() const override;
 
-  virtual bool isConflicting(const ConstOsmMapPtr& map, ConstMatchPtr m1, ConstMatchPtr m2) const override;
+  virtual bool isConflicting(
+    const ConstOsmMapPtr& map, ConstMatchPtr m1, ConstMatchPtr m2,
+    const QHash<QString, ConstMatchPtr>& matches = QHash<QString, ConstMatchPtr>()) const override;
 
   virtual void setOsmMap(const OsmMap* map) override { _map = map; }