diff --git a/Dockerfile b/Dockerfile
index e278baf..62ed7b6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,9 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 1656898 (Update harbor url)
 ARG CACHE_DOCKER_REGISTRY_URL="harbor.tech.padam.io:443/"
 ARG CACHE_DOCKER_REGISTRY_PROXY_PROJECT="library/"