Fix merge

assets/layers/last_click/last_click.json

@@ -1,4 +1,5 @@
 {
+  "id": "last_click",
   "description": "This layer defines how to render the 'last click'-location. By default, it will show a marker with the possibility to add a new point (if there are some presets) and/or to add a new note (if the 'note' layer attribute is set). If none are possible, this layer won't show up",
   "source": "special",
   "isShown": {

assets/layers/usersettings/usersettings.json

@@ -648,5 +648,6 @@
       "render": "{all_tags()}"
     }
   ],
-  "mapRendering": null
+  "lineRendering": null,
+  "pointRendering": null
 }

assets/layers/waste_basket/waste_basket.json

@@ -391,9 +391,8 @@
   "pointRendering": [
     {
       "icon": "./assets/themes/waste_basket/waste_basket.svg",
-      "iconSize": {
-        "render": "40,40,center"
-      },
+      "iconSize": "40,40",
+      "anchor": "center",
       "location": [
         "point"
       ]