Allow typing in middle window of conflictResolution tool

[mgorra]

Currently the user can only edit the conflicting file in the tool via accepting or rejecting changes. They should also be able to edit the file via typing, and have that input be recorded.
This is a pretty major feature to add, since it would require restructuring how the tool saves and parses files and conflicts.