diff --git a/JugarAlPadel/K8S/Makefile b/JugarAlPadel/K8S/Makefile
index 69d435d..1dba8eb 100644
--- a/JugarAlPadel/K8S/Makefile
+++ b/JugarAlPadel/K8S/Makefile
@@ -1,7 +1,13 @@
 export ARQUITECTURA := $(shell lscpu |grep itectur | tr -d ' '| cut -f2 -d':')
+<<<<<<< HEAD
 #export REGISTRY=localhost:5000
 export REGISTRY=registry.reymota.es
 export IMG_VERSION = 0.14
+=======
+export REGISTRY=localhost:5000
+#export REGISTRY=registry.reymota.es
+export IMG_VERSION = 0.04
+>>>>>>> fb4214658b6a7ae3582bb2ee6bcacd939c9c2698
 export IMG_NGINX_VERSION = 2.3
 
 # limpia todo