Conflict Resolver
Awaiting Input
Paste Conflicted File
Load Sample
Parse Conflicts
Conflict 1 of 3
Cancel
Copy Resolved File
Notice
Manual Edit
Cancel
Save Edit