first commit
resolviendo conflictos