CONFLICT RESOLVEMENT view 1