CONFLICT RESOLVEMENT view 2