Repository navigation
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
Reacted by coderabbitai
Activity
coderabbitai commentedon Dec 19, 2025
📝 CodeRabbit Plan Mode
Generate an implementation plan and prompts that you can use with your favorite coding agent.
Examples
🔗 Related PRs
AOSSIE-Org/Devr.AI#134 - BUG: #133 - Fix frontend issues [merged]
👤 Suggested Assignees
🧪 Issue enrichment is currently in open beta.
You can configure auto-planning by selecting labels in the issue_enrichment configuration.
To disable automatic issue enrichment, add the following to your
.coderabbit.yaml:💬 Have feedback or questions? Drop into our discord or schedule a call!
Abhishek2005-ard commentedon Dec 19, 2025
Hi maintainers,
I’d like to work on this issue and submit a fix.
Please let me know if I can proceed.
Thanks!
bhavik-mangla commentedon Dec 21, 2025
Is this issue still valid? Did @ARCoder181105's PR resolve these?
bhavik-mangla commentedon Dec 21, 2025
#132 will resolve these
JaYRaNa213 commentedon Dec 21, 2025
Ok @bhavik-mangla
I got it now .
Thanks for your response
ARCoder181105 commentedon Dec 21, 2025
@bhavik-mangla
I’ve fixed the backend merge issue. The frontend issue is still present. If it’s already resolved on your side, then it’s good.
Suraj0950 commentedon Dec 21, 2025
I have already resolved this issue (Frontend merge conflict) in #132
Please review about this error and inform me.
Suraj0950 commentedon Dec 21, 2025
I have already resolved this issue (Frontend merge conflict) in #132
Please review about this error and inform me.
bhavik-mangla commentedon Dec 27, 2025
3 PRs for the same issue 🙈
bhavik-mangla commentedon Dec 27, 2025
I have merged the PR #139
It should close this issue
@Suraj0950 @ayush00git good work too
Suraj0950 commentedon Dec 28, 2025
Thanks Sir, @bhavik-mangla
I am contributing for next Issue.