Mastering Conflict Resolution