How to resolve a Merge Conflict in GitHub Desktop 2:04 | A processar vídeo... A Carregar... Transferir