Commit na ch
Commit na MASTER
Commit na ch
Resolvido o conflito