1.2.3, fix contact keys better

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master branch
 
+## 1.2.3
+
+_Released 2017-12-29_
+
 * Fix error in applying audit json after conflating `contact:` namespace.
 
 ## 1.2.2

conflate/conflate.py

@@ -493,9 +493,9 @@ class OsmConflator:
                 for k, v in source.items():
                     osm_key = get_osm_key(k, tags)
 
-                    if osm_key in keep:
+                    if k in keep or osm_key in keep:
                         continue
-                    if osm_key in override:
+                    if k in override or osm_key in override:
                         if not v and osm_key in tags:
                             del tags[osm_key]
                             changed = True

conflate/version.py

@@ -1 +1 @@
-__version__ = '1.2.2'
+__version__ = '1.2.3'