Adds support for interactive conflict resolution.
Updates conflict description.
Adds interactive conflict resolution tests.
Updates README.