diff --git a/Logic/Osm/OsmConnection.ts b/Logic/Osm/OsmConnection.ts
index 945580788..2f32b5566 100644
--- a/Logic/Osm/OsmConnection.ts
+++ b/Logic/Osm/OsmConnection.ts
@@ -314,7 +314,7 @@ export class OsmConnection {
 
     }
     
-    public addCommentToNode(id: number | string, text: string): Promise<void> {
+    public addCommentToNote(id: number | string, text: string): Promise<void> {
         if (this._dryRun.data) {
             console.warn("Dryrun enabled - not actually adding comment ", text, "to  note ", id)
             return new Promise((ok) => {
diff --git a/Logic/Tags/TagUtils.ts b/Logic/Tags/TagUtils.ts
index b36597ed6..c358f8cbd 100644
--- a/Logic/Tags/TagUtils.ts
+++ b/Logic/Tags/TagUtils.ts
@@ -216,19 +216,11 @@ export class TagUtils {
      *
      * TagUtils.Tag("xyz<5").matchesProperties({xyz: 4}) // => true
      * TagUtils.Tag("xyz<5").matchesProperties({xyz: 5}) // => false
-<<<<<<< HEAD
      * 
      * // RegexTags must match values with newlines
      * TagUtils.Tag("note~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De aed bevindt zich op de 5de verdieping"}) // => true
      * TagUtils.Tag("note~i~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De AED bevindt zich op de 5de verdieping"}) // => true
-     * 
-=======
      *
-     * // RegexTags must match values with newlines
-     * TagUtils.Tag("note~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De aed bevindt zich op de 5de verdieping"}) // => true
-     * TagUtils.Tag("note~i~.*aed.*").matchesProperties({note: "Hier bevindt zich wss een defibrillator. \\n\\n De AED bevindt zich op de 5de verdieping"}) // => true
-     *
->>>>>>> master
      * // Must match case insensitive
      * TagUtils.Tag("name~i~somename").matchesProperties({name: "SoMeName"}) // => true
      */
diff --git a/UI/ImportFlow/ImportViewerGui.ts b/UI/ImportFlow/ImportViewerGui.ts
index 7c9559689..3dc4f827d 100644
--- a/UI/ImportFlow/ImportViewerGui.ts
+++ b/UI/ImportFlow/ImportViewerGui.ts
@@ -112,7 +112,7 @@ class MassAction extends Combine {
                     predicate: p => p.status === "open",
                     action: async p => {
                         const txt = textField.GetValue().data
-                        state.osmConnection.addCommentToNode(p.id, txt)
+                        state.osmConnection.addCommentToNote(p.id, txt)
                     }
                 },
                 shown: "Add comment to every open note"
diff --git a/UI/SpecialVisualizations.ts b/UI/SpecialVisualizations.ts
index 66621aaf4..37efa9f13 100644
--- a/UI/SpecialVisualizations.ts
+++ b/UI/SpecialVisualizations.ts
@@ -949,7 +949,7 @@ export default class SpecialVisualizations {
                                     await state.osmConnection.reopenNote(id, txt.data)
                                     await state.osmConnection.closeNote(id)
                                 } else {
-                                    await state.osmConnection.addCommentToNode(id, txt.data)
+                                    await state.osmConnection.addCommentToNote(id, txt.data)
                                 }
                                 NoteCommentElement.addCommentTo(txt.data, tags, state)
                                 txt.setData("")
@@ -1045,7 +1045,7 @@ export default class SpecialVisualizations {
 
                         const uploader = new ImgurUploader(url => {
                             isUploading.setData(false)
-                            state.osmConnection.addCommentToNode(id, url)
+                            state.osmConnection.addCommentToNote(id, url)
                             NoteCommentElement.addCommentTo(url, tags, state)
 
                         })