cambio a dev para solventar summary
conflict resolved
reprov y refac listos
merging