diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c20685..9cce2f1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,8 @@
-
-
-
-
-
+
+
@@ -86,7 +83,7 @@
"RunOnceActivity.git.unshallow": "true",
"RunOnceActivity.typescript.service.memoryLimit.init": "true",
"com.intellij.ml.llm.matterhorn.ej.ui.settings.DefaultModelSelectionForGA.v1": "true",
- "git-widget-placeholder": "main",
+ "git-widget-placeholder": "Merging main",
"junie.onboarding.icon.badge.shown": "true",
"kotlin-language-version-configured": "true",
"node.js.detected.package.eslint": "true",
@@ -126,7 +123,7 @@
-
+
@@ -336,7 +333,39 @@
1767855859506
-
+
+
+ 1768160863671
+
+
+
+ 1768160863671
+
+
+
+ 1768160874544
+
+
+
+ 1768160874544
+
+
+
+ 1768160891269
+
+
+
+ 1768160891269
+
+
+
+ 1768160901310
+
+
+
+ 1768160901310
+
+
@@ -354,9 +383,6 @@
-
-
-
@@ -378,7 +404,11 @@
-
+
+
+
+
+
diff --git a/README.md b/README.md
index 5115d19..54cc7da 100644
--- a/README.md
+++ b/README.md
@@ -38,4 +38,8 @@ Each Java Class is a **standalone mini-project**
- Data verification
- CI/CD
- scheduled tasks / Batch jobs
- - Unit Testing
\ No newline at end of file
+<<<<<<< HEAD
+ - Unit Testing
+=======
+ - Unit Testing
+>>>>>>> 3e3275919bf4da68d9306358f14f480350363511