Add the "resolved" class once a side is resolved.
Handle conflict resolution in the buffer.