fix merge conflicts

abhishek9686 · abhishek9686 · commit 4e2b7993eb54 · 2025-06-24T17:00:43.000+05:30
diff --git a/migrate/migrate.go b/migrate/migrate.go
@@ -74,7 +74,7 @@ func resync() {
 			}
 		}
 		if node.InternetGwID != "" {
-			_, err := logic.GetNodeByID(node.ID.String())
+			_, err := logic.GetNodeByID(node.InternetGwID)
 			if err != nil {
 				node.InternetGwID = ""
 				logic.UpsertNode(&node)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func resync() {`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`	`if node.InternetGwID != "" {`
`77`		`- _, err := logic.GetNodeByID(node.ID.String())`
	`77`	`+ _, err := logic.GetNodeByID(node.InternetGwID)`
`78`	`78`	`if err != nil {`
`79`	`79`	`node.InternetGwID = ""`
`80`	`80`	`logic.UpsertNode(&node)`