Browsing: CONFLICT RESOLUTION