Version que funciona
merge problem fixed