How to resolve merge conflict in GIT - Simple steps 9:22 | A processar vídeo... A Carregar... Transferir