diff --git a/godot4/Dockerfile b/godot4/Dockerfile
index 50d06fd..2833d2d 100644
--- a/godot4/Dockerfile
+++ b/godot4/Dockerfile
@@ -28,7 +28,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libxrandr-dev \
     && rm -rf /var/lib/apt/lists/*
 
+<<<<<<< HEAD
 ENV GODOT_VERSION="4.2.2-stable"
+=======
+ENV GODOT_VERSION="4.0.2-stable"
+>>>>>>> d821de56600d8b8fc651f35d6369976482f5fc1a
 
 RUN wget https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_linux.x86_64.zip \
     && wget https://github.com/godotengine/godot/releases/download/${GODOT_VERSION}/Godot_v${GODOT_VERSION}_export_templates.tpz \