commit inicial
commit
resolver comflictos
Resolver conflictos