v0.2.54..v0.2.55 changeset ScriptMergerCreator.h

diff --git a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h
index 565c41a..7b1f40a 100644
--- a/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h
+++ b/hoot-js/src/main/cpp/hoot/js/conflate/merging/ScriptMergerCreator.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef SCRIPTMERGERCREATOR_H
 #define SCRIPTMERGERCREATOR_H
@@ -47,12 +47,14 @@ public:
   /**
    * If all the matches are CustomPoiMatches, a single CustomPoiMerger will be created and returned.
    */
-  virtual bool createMergers(const MatchSet& matches, std::vector<MergerPtr>& mergers) const override;
+  virtual bool createMergers(const MatchSet& matches,
+                             std::vector<MergerPtr>& mergers) const override;
 
   virtual std::vector<CreatorDescription> getAllCreators() const override;
 
-  virtual bool isConflicting(const ConstOsmMapPtr& map, ConstMatchPtr m1, ConstMatchPtr m2) const;
-
+  virtual bool isConflicting(
+    const ConstOsmMapPtr& map, ConstMatchPtr m1, ConstMatchPtr m2,
+    const QHash<QString, ConstMatchPtr>& matches = QHash<QString, ConstMatchPtr>()) const;
 };
 
 }