diff --git a/pom.xml b/pom.xml
index 805d8221e..4baaa0bab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,15 +48,9 @@
     <org.apache.commons.lang3.version>3.13.0</org.apache.commons.lang3.version>
     <org.apache.commons.validator.version>1.7</org.apache.commons.validator.version>
     <org.projectnessie.cel.bom.version>0.4.4</org.projectnessie.cel.bom.version>
-<<<<<<< HEAD
-    <com.google.protobuf-java.version>3.25.2</com.google.protobuf-java.version>
+    <com.google.protobuf-java.version>3.25.5</com.google.protobuf-java.version>
     <com.nimbusds.jose.jwt.version>9.37.3</com.nimbusds.jose.jwt.version>
     <org.testcontainers.bom.version>1.19.8</org.testcontainers.bom.version>
-=======
-    <com.google.protobuf-java.version>3.25.5</com.google.protobuf-java.version>
-    <com.nimbusds.jose.jwt.version>9.41.1</com.nimbusds.jose.jwt.version>
-    <org.testcontainers.bom.version>1.20.2</org.testcontainers.bom.version>
->>>>>>> 5eb83ab (build(deps): bump com.google.protobuf:protobuf-java from 3.25.2 to 3.25.5 (#675))
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.version>3.2.12.Final</quarkus.platform.version>
diff --git a/src/main/webui b/src/main/webui
index d5dde6496..7a22d6501 160000
--- a/src/main/webui
+++ b/src/main/webui
@@ -1 +1 @@
-Subproject commit d5dde64961df640d163652a33f36deb758d9251f
+Subproject commit 7a22d6501fca2b074749a908d41f682baddefef1