resolved conflict.

data/core.yaml

@@ -136,10 +136,7 @@ en:
     no_documentation_key: There is no documentation available for this key
     show_more: Show More
     new_tag: New tag
-    edit_tags: Edit tags
-    okay: Okay
     view_on_osm: View on OSM
-    name: Name
     editing_feature: "Editing {feature}"
     additional: Additional tags
     choose: Select feature type

data/presets.yaml

@@ -76,6 +76,8 @@ en:
         label: Type
       maxspeed: 
         label: Speed Limit
+      name: 
+        label: Name
       natural: 
         label: Natural
       network: 

data/presets/fields.json

@@ -196,6 +196,11 @@
         "type": "combo",
         "label": "Speed Limit"
     },
+    "name": {
+        "key": "name",
+        "type": "text",
+        "label": "Name"
+    },
     "natural": {
         "key": "natural",
         "type": "combo",

data/presets/fields/name.json

@@ -0,0 +1,5 @@
+{
+    "key": "name",
+    "type": "text",
+    "label": "Name"
+}