modified from another place :   prueba4.txt
Resolve conflicts prueba4.txt