Conflictedl view 2