diff --git a/README.md b/README.md
index 54cc7da..4f9daa4 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,4 @@ Each Java Class is a **standalone mini-project**
   - Data verification
   - CI/CD
   - scheduled tasks / Batch jobs
-<<<<<<< HEAD
-  - Unit Testing
-=======
-  - Unit Testing
->>>>>>> 3e3275919bf4da68d9306358f14f480350363511
+