From 26a214b874d1ab14d240fd7b5a234c6bd40ed48c Mon Sep 17 00:00:00 2001
From: sajeetharan <sajeefx@gmail.com>
Date: Mon, 3 Aug 2026 11:14:42 +0530
Subject: [PATCH] fix: resolve merge conflicts in README.md and streamline
 content

---
 README.md | 159 +-----------------------------------------------------
 1 file changed, 2 insertions(+), 157 deletions(-)

diff --git a/README.md b/README.md
index 8760d8d..b48171e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <div align="center">
 
 # 🌐 DevGlobe
@@ -8,55 +7,18 @@
 [![Live Demo](https://img.shields.io/badge/Live-Demo-blue?style=for-the-badge&logo=vercel)](https://devglobe.vercel.app)
 [![GitHub Stars](https://img.shields.io/github/stars/sajeetharan/devglobe?style=for-the-badge&logo=github)](https://github.com/sajeetharan/devglobe/stargazers)
 [![License](https://img.shields.io/github/license/sajeetharan/devglobe?style=for-the-badge)](LICENSE)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen?style=for-the-badge)](CONTRIBUTING.md)
 
 <img src="assets/img/devglobe.gif" alt="DevGlobe Demo" width="800" />
 
 *26,000+ developers · ranked by stars, commits, repo reach & StackOverflow reputation*
 
 </div>
-=======
-# 🌍 DevGlobe — Visualizing the World's Top Open-Source Contributors
-
-<p align="center">
-  <img src="https://img.shields.io/badge/status-active-success" alt="Status" />
-  <img src="https://img.shields.io/badge/license-MIT-blue" alt="License" />
-  <img src="https://img.shields.io/github/stars/sajeetharan/devglobe?style=social" alt="Stars" />
-  <img src="https://img.shields.io/badge/PRs-welcome-brightgreen" alt="PRs Welcome" />
-</p>
-
-<p align="center">
-  <img src="https://img.shields.io/badge/JavaScript-Vanilla-F7DF1E?logo=javascript&logoColor=black" alt="JavaScript" />
-  <img src="https://img.shields.io/badge/D3.js-Data%20Viz-F9A03C?logo=d3.js&logoColor=white" alt="D3.js" />
-  <img src="https://img.shields.io/badge/globe.gl-3D%20Globe-blueviolet" alt="globe.gl" />
-  <img src="https://img.shields.io/badge/Vercel-Deployed-black?logo=vercel&logoColor=white" alt="Vercel" />
-  <img src="https://img.shields.io/badge/Azure%20Cosmos%20DB-Database-0089D6?logo=microsoftazure&logoColor=white" alt="Azure Cosmos DB" />
-</p>
-
-<p align="center">
-  <b>An interactive 3D globe showcasing 40,000+ top open-source contributors worldwide, ranked by GitHub stars, commits, and Stack Overflow impact.</b>
-</p>
-
-<p align="center">
-  🔗 <a href="https://dev-globe-viz.vercel.app">Live Demo</a>
-</p>
-
----
-
-## 📸 Preview
-
-<!-- TODO: Replace with an actual screenshot or GIF of the globe in action -->
-<p align="center">
-  <img src="docs/preview.gif" alt="DevGlobe demo preview" width="800" />
-</p>
-
-> Want to add this? Drop a screenshot or screen recording of the globe UI in a `docs/` folder and update the path above — see [good first issues](https://github.com/sajeetharan/devglobe/issues) for details.
->>>>>>> origin/main
 
 ---
 
 ## ✨ Features
 
-<<<<<<< HEAD
 - **Interactive 3D Globe** — Explore developers pinned to their real-world locations using Three.js
 - **AI-Powered Search** — Hybrid + vector search via Azure Cosmos DB (e.g. "AI & deep learning", "full stack JS dev")
 - **Composite Scoring** — Each developer scored 0–100 across 6 dimensions
@@ -65,72 +27,8 @@
 - **Mobile Responsive** — Bottom-sheet filters and full-width search on smaller screens
 
 ## 🚀 Quick Start
-=======
-- 🌐 **Interactive 3D globe** — pan, zoom, and rotate through developer locations in real time
-- 🏆 **Composite ranking** — developers scored across GitHub stars, commits, repo reach, and Stack Overflow reputation
-- 📊 **Rich detail panels** — radar charts, heatmaps, and donut charts per developer, powered by D3.js
-- 🔍 **Searchable leaderboard** — filter and search 40,000+ contributors from a ranked sidebar
-- ⚡ **Fast, serverless data layer** — Vercel serverless functions backed by Azure Cosmos DB
-- 🧩 **Zero-config local dev** — runs instantly with bundled sample data, no API keys required
-
----
-
-## 🏗️ Architecture
-
-```
-                     ┌─────────────────────┐
-                     │   Data Sources       │
-                     │  GitHub GraphQL API  │
-                     │  Stack Overflow API  │
-                     │  Geocoding API       │
-                     └──────────┬───────────┘
-                                │
-                                ▼
-                 ┌───────────────────────────┐
-                 │   scripts/ (build pipeline) │
-                 │  fetch → enrich → geocode   │
-                 │        → score              │
-                 └──────────────┬─────────────┘
-                                │
-                                ▼
-                     ┌─────────────────────┐
-                     │  Azure Cosmos DB      │
-                     │  (developer records)  │
-                     └──────────┬───────────┘
-                                │
-                                ▼
-                   ┌─────────────────────────┐
-                   │  api/developers.js        │
-                   │  Vercel serverless        │
-                   └──────────────┬───────────┘
-                                  │
-                                  ▼
-                     ┌─────────────────────┐
-                     │   Frontend (src/)     │
-                     │  globe.js — 3D globe  │
-                     │  detail-panel.js — D3 │
-                     │  leaderboard.js       │
-                     │  scoring.js           │
-                     └───────────────────────┘
-```
 
----
-
-## 🛠️ Tech Stack
-
-| Layer | Technology |
-|---|---|
-| 3D Visualization | [globe.gl](https://globe.gl/) (Three.js) |
-| Charts | [D3.js](https://d3js.org/) |
-| Frontend | Vanilla JavaScript (no framework), CSS custom properties |
-| Backend | [Vercel Serverless Functions](https://vercel.com/docs/functions) |
-| Database | [Azure Cosmos DB](https://azure.microsoft.com/en-us/products/cosmos-db) |
-| Data Sources | GitHub GraphQL API, Stack Overflow API, Geocoding API |
-
----
-
-## 🚀 Quick Start (with sample data)
->>>>>>> origin/main
+## 🚀 Quick Start
 
 ```bash
 git clone https://github.com/sajeetharan/devglobe.git
@@ -140,13 +38,7 @@ npm run dev
 # Open http://localhost:5173
 ```
 
-<<<<<<< HEAD
 The app runs with sample data out of the box — no API keys needed for local development.
-=======
-No API keys required — the app ships with bundled sample data for local development.
-
-## 🔧 Build Full Dataset (with API keys)
->>>>>>> origin/main
 
 ## 🏗️ Tech Stack
 
@@ -183,7 +75,6 @@ npm run build-data            # Run full pipeline
 npm run upload-cosmos         # Upload to Azure Cosmos DB
 ```
 
-<<<<<<< HEAD
 ## 📁 Project Structure
 
 ```
@@ -212,21 +103,6 @@ npm run upload-cosmos         # Upload to Azure Cosmos DB
 ```
 
 ## 🌍 Deploy to Vercel
-=======
-This executes: **GitHub fetch → StackOverflow fetch → Geocoding → Scoring**
-
-3. Update `DATA_URL` in `src/app.js` to `'data/developers.json'`
-
-### Individual Pipeline Steps
-
-```bash
-npm run fetch-github        # Fetch top devs from GitHub GraphQL
-npm run fetch-stackoverflow # Enrich with SO reputation
-npm run geocode              # Convert locations to lat/lng
-```
-
-## ☁️ Deploy to Vercel
->>>>>>> origin/main
 
 ```bash
 npx vercel
@@ -234,22 +110,15 @@ npx vercel
 
 Required environment variables:
 
-<<<<<<< HEAD
 | Variable | Purpose |
 |----------|---------|
 | `COSMOS_ENDPOINT` | Azure Cosmos DB endpoint |
 | `COSMOS_KEY` | Azure Cosmos DB key |
 | `COSMOS_DATABASE` | Database name |
 | `COSMOS_CONTAINER` | Container name |
-=======
----
-
-## 📁 Project Structure
->>>>>>> origin/main
 
 ## 🤝 Contributing
 
-<<<<<<< HEAD
 Contributions are welcome! See [CONTRIBUTING.md](CONTRIBUTING.md) for setup instructions and areas where help is needed.
 
 ## 📄 License
@@ -265,27 +134,3 @@ MIT — see [LICENSE](LICENSE) for details.
 Built with ❤️ by [@sajeetharan](https://github.com/sajeetharan)
 
 </div>
-=======
-## 📐 Scoring Formula (0–100)
-
-| Dimension | Weight | Source |
-|---|---|---|
-| GitHub Stars | 25% | Total stars |
-| GitHub Commits | 25% | Yearly commits |
-| Repo Reach | 20% | Forks + watchers |
-| SO Reputation | 15% | StackOverflow rep |
-| SO Engagement | 10% | Acceptance × answers |
-| Community | 5% | Followers + badges |
-
-All dimensions are log-normalized to prevent outlier domination.
-
----
-
-## 🤝 Contributing
-
-Contributions are welcome! See [CONTRIBUTING.md](./CONTRIBUTING.md) for setup instructions, code style, and open areas to help with.
-
-## 📄 License
-
-MIT
->>>>>>> origin/main