Fix conflicts

Author: tmkx

src/avatars.ts

@@ -183,7 +183,7 @@ async function getAvatarUriFromRemoteProvider(
 
 	try {
 		if (typeof repoPathOrCommit !== 'string') {
-			const remotes = await Container.git.getRemotes(repoPathOrCommit.repoPath);
+			const remotes = await Container.instance.git.getRemotes(repoPathOrCommit.repoPath);
 			const [name, domain] = email.split('@');
 			for (const remote of remotes) {
 				const uri = remote.provider.getUrlForAvatar({