disney torrent git resolve conflicts