From 1fc60102f656f8ec514cf02212f47700e1ce0c10 Mon Sep 17 00:00:00 2001
From: Nicola Jordan <hixi@users.noreply.github.com>
Date: Tue, 13 Feb 2018 10:35:03 +0100
Subject: [PATCH] Use a simplified non-clashing property.

---
 conflate/conflate.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conflate/conflate.py b/conflate/conflate.py
index 563de5f..b10ce54 100755
--- a/conflate/conflate.py
+++ b/conflate/conflate.py
@@ -630,7 +630,7 @@ class OsmConflator:
                         props['tags_changed.{}'.format(k)] = '{} -> {}'.format(v0, v1)
             props['marker-color'] = MARKER_COLORS[marker_action]
             if ref and ref.remarks:
-                props['__remarks__'] = ref.remarks
+                props['_remarks'] = ref.remarks
             return {'type': 'Feature', 'geometry': geometry, 'properties': props}
 
         max_distance = self.profile.get('max_distance', MAX_DISTANCE)