ResWa WIP.
Conflict Resolution