angel cambio edwin.txt
conflict fixed