Conflict resolution submodule

Problem/Motivation

The module should implement the ability to resolve conflicts in entities that were edited in live or a parent workspace and have changes inside another workspace/a descendant workspace.

This will also allow the change of entities in live/a parent workspace while they have pending revisions inside a workspace.

Proposed resolution

The conflict module → already implements a great base to detect and resolve conflicts, thus this new submodule will basically integrate with conflict's API.

Remaining tasks

User interface changes

API changes

Data model changes