Frontend Unresolved Git Merge Conflicts #135
Description
Issue Name
Build fails due to unresolved Git merge conflict markers (frontend) and duplicate declarations (backend)
What is the Issue?
The repository contains unresolved Git merge conflict markers (<<<<<<<, =======, >>>>>>>) in committed source code and duplicate symbol declarations in backend Go files.
Because of this, the project does not build or run from a fresh clone.
Screenshots
When Does This Issue Occur?
This issue occurs when:
- A contributor forks and clones the repository
- No code changes are made
- Standard setup commands are executed
Frontend
cd frontend
npm install
npm run dev
Backend
cd backend
go mod tidy
go run .
Affected Files
Frontend (Unresolved Merge Conflict Markers)
frontend/src/Pages/Game.tsx
frontend/src/Pages/MatchLogs.tsx
frontend/src/Pages/TeamBuilder.tsx
frontend/src/Pages/TeamDebateRoom.tsx
Backend (Duplicate Declarations)
backend/config/config.go
backend/models/comment.go
backend/models/admin.go
Impact
Frontend fails with syntax errors (Unexpected token "<<")
Backend fails with duplicate declaration errors
Project cannot run or be tested from a clean clone
Expected Behavior
No Git merge conflict markers in committed code
Frontend runs with npm run dev
Backend runs with go run .
hello @bhavik-mangla sir
assign this issue to me