diff --git a/clickhouse/docker-compose.yml b/clickhouse/docker-compose.yml
index 0715de5..676a9ed 100644
--- a/clickhouse/docker-compose.yml
+++ b/clickhouse/docker-compose.yml
@@ -5,6 +5,7 @@ volumes:
 
 services:
   clickhouse:
+<<<<<<< HEAD
     image: clickhouse/clickhouse-server:25.8-alpine
     container_name: clickhouse
     restart: unless-stopped