⚔️ Conflict Resolver
Scenario
✅ Accept Ours
🔀 Accept Theirs
🤝 Accept Both
Resolved
Pick a resolution...
➡️ Next Conflict