diff --git a/jka-toolkit/gitdit b/jka-toolkit/gitdit
index 4628aaa..ee1f3f2 100755
--- a/jka-toolkit/gitdit
+++ b/jka-toolkit/gitdit
@@ -1,4 +1,5 @@
 #!/bin/bash
+<<<<<<< HEAD
 VERSION="0.2.1"
 preOption=$(git status 2>/dev/stdout | sed -n 1p | cut -f2 -d" ")
 if [ $preOption = "Not" ];then
@@ -7,6 +8,11 @@ else
 	gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge)"`
 	actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
 fi
+=======
+VERSION="0.2.0"
+gitopt=`dialog --stdout --scrollbar --menu "gitdit - Git DIalog inTerface" 0 0 6 p "Descargar actualizaciones del git (Hacer pull)" t "Confirmar cambios sin subida" s "Subir actualizaciones al git (Hacer push)" c "Descargar un nuevo git (Hacer clone)" n "Crear nueva rama" b "Cambiar de branch/rama (Hacer checkout)" m "Unir ramas (Hacer merge a la rama actual)"`
+actual="origin $(git branch --list | grep "^*" | cut -f2 -d" ")"
+>>>>>>> 2da0286157275673f471fb4fedc9f166b1926275
 case $gitopt in
 	"p")	git pull $actual;;
 	"s")	commit=`dialog --stdout --inputbox  "Cambios (texto commit)" 10 50 "changes"`
@@ -59,7 +65,7 @@ case $gitopt in
 				let j++
 			fi		
 		done
-		merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir" 0 0 6 $rama`
+		merges=`dialog --stdout --scrollbar --menu "Selecione la rama a unir a $(git branch --list | grep "^*" | cut -f2 -d" ")" 0 0 6 $rama`
 		if [ ! -z $merges ];then
 			git merge ${lista[$merges]}
 			git push
diff --git a/jka-toolkit/pruebas b/jka-toolkit/pruebas
deleted file mode 100644
index 8b63174..0000000
--- a/jka-toolkit/pruebas
+++ /dev/null
@@ -1,3 +0,0 @@
-* hotfix
-  master
-  pruebas