chore: fix merge issue

Author: darklight3it

.gitignore

@@ -38,8 +38,6 @@ experimental/aws-lambda-java-profiler/integration_tests/helloworld/bin
 .vscode
 .kiro
 build
-<<<<<<< HEAD
-=======
 
 # Logs
 *.log
@@ -52,5 +50,4 @@ build
 *.swo
 
 # Tool version manager
->>>>>>> 45b43fe (chore: adding other files to .gitignore)
 mise.toml

aws-lambda-java-events/pom.xml

@@ -39,11 +39,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <jackson.version>2.20.1</jackson.version>
         <json.unit>2.40.1</json.unit>
-<<<<<<< HEAD
-        <junit-jupiter.version>5.12.2</junit-jupiter.version>
-=======
         <junit-jupiter.version>5.14.3</junit-jupiter.version>
->>>>>>> 7946ec4 (build: upgrading junit-jupiter everywhere)
     </properties>
 
     <distributionManagement>