Merge upstream/main - resolve conflicts with GitHub deployment feature

- Resolved merge conflicts in DeployButton.tsx
- Kept upstream versions of GitHubDeploy.client.tsx and GitHubDeploymentDialog.tsx
- Fixed linting issues and formatting
- Maintained proper GitHub deployment functionality
- Ready for cleanup improvements

app/components/deploy/DeployButton.tsx

@@ -129,9 +129,7 @@ export const DeployButton = ({ onVercelDeploy, onNetlifyDeploy, onGitHubDeploy }
                 crossOrigin="anonymous"
                 src="https://cdn.simpleicons.org/netlify"
               />
-              <span className="mx-auto">
-                {!netlifyConn.user ? 'No Netlify Account Connected' : 'Deploy to Netlify'}
-              </span>
+              <span className="mx-auto">{!netlifyConn.user ? 'No Netlify Account Connected' : 'Deploy to Netlify'}</span>
               {netlifyConn.user && <NetlifyDeploymentLink />}
             </DropdownMenu.Item>