Conflict view 2