conflict view 2