diff --git a/deps/deps.json b/deps/deps.json
index 8e61268..a59031e 100644
--- a/deps/deps.json
+++ b/deps/deps.json
@@ -126,13 +126,13 @@
     "aopalliance-repackaged": "mvn:org.glassfish.hk2.external:aopalliance-repackaged:2.5.0-b42",
     "amqp-client": "mvn:com.rabbitmq:amqp-client:jar:3.6.1",
     "asm": "mvn:org.ow2.asm:asm:5.2",
-    "atomix": "mvn:io.atomix:atomix:3.1.5",
-    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.1.5",
-    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.1.5",
-    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.1.5",
-    "atomix-raft": "mvn:io.atomix:atomix-raft:3.1.5",
-    "atomix-storage": "mvn:io.atomix:atomix-storage:3.1.5",
-    "atomix-utils": "mvn:io.atomix:atomix-utils:3.1.5",
+    "atomix": "mvn:io.atomix:atomix:3.1.9",
+    "atomix-cluster": "mvn:io.atomix:atomix-cluster:3.1.9",
+    "atomix-primary-backup": "mvn:io.atomix:atomix-primary-backup:3.1.9",
+    "atomix-primitive": "mvn:io.atomix:atomix-primitive:3.1.9",
+    "atomix-raft": "mvn:io.atomix:atomix-raft:3.1.9",
+    "atomix-storage": "mvn:io.atomix:atomix-storage:3.1.9",
+    "atomix-utils": "mvn:io.atomix:atomix-utils:3.1.9",
     "classgraph": "mvn:io.github.classgraph:classgraph:4.2.3",
     "commons-codec": "mvn:commons-codec:commons-codec:1.10",
     "commons-cli": "mvn:commons-cli:commons-cli:1.3",
@@ -178,18 +178,11 @@
     "moshi": "mvn:com.squareup.moshi:moshi:1.4.0",
     "okio": "mvn:com.squareup.okio:okio:1.14.0",
     "jacoco-agent-runtime": "mvn:org.jacoco:org.jacoco.agent:jar:runtime:0.8.2",
-<<<<<<< HEAD
-    "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.10.0",
-    "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.10.0",
-    "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.10.0",
-    "jackson-dataformat-yaml": "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.0",
-=======
     "jackson-annotations": "mvn:com.fasterxml.jackson.core:jackson-annotations:2.11.0",
     "jackson-core": "mvn:com.fasterxml.jackson.core:jackson-core:2.11.0",
     "jackson-databind": "mvn:com.fasterxml.jackson.core:jackson-databind:2.11.0",
     "jackson-datatype-jsr310": "mvn:com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.0",
     "jackson-dataformat-yaml": "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.0",
->>>>>>> Bumpup kubernetes client from 4.7.1 to 5.0.0 (support up to kubernetes 1.19)
 
     // Note: grpc imports "javax_annotation_api" has an http file, so we need to give a different name here
     // See WORKSPACE