Fix merge conflict issues

Author: NipunaRanasinghe

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AgentsGenerator.java

@@ -381,7 +381,7 @@ public JsonElement genTool(JsonElement node, String toolName, String connectionN
                 if (codedata != null) {
                     String kind = codedata.kind();
                     if (kind != null && kind.equals(ParameterData.Kind.DEFAULTABLE.name())) {
-                        ignoredKeys.add(key);
+                        ignoredKeys.add(k);
                         continue;
                     }
                 }
@@ -479,9 +479,9 @@ public JsonElement genTool(JsonElement node, String toolName, String connectionN
                     String kind = codedata.kind();
                     if (kind.equals(ParameterData.Kind.PATH_PARAM.name()) ||
                             kind.equals(ParameterData.Kind.PATH_REST_PARAM.name())) {
-                        pathParams.add(key);
+                        pathParams.add(k);
                     } else if (kind.equals(ParameterData.Kind.DEFAULTABLE.name())) {
-                        ignoredKeys.add(key);
+                        ignoredKeys.add(k);
                         continue;
                     }
                 }