Add form fixed. Links to index added
Conflict page now displays all conflicts
Conflict page copy conflicting docs properties
Now resolves conflicts
Create-a-conflict function
Fixed conflict resolution