recomecar de novo
init 2
gitignore
resolve conflits
resolve conflits