https://aspaqlaria.aishdas.org/2005/07/03/conflict-resolution/
Conflict Resolution